Merge branch 'master' of github.com:grafana/grafana

torkelo · torkelo · commit 83afbd4262a1 · 2016-12-06T11:58:51.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -23,6 +23,7 @@
 * **PNG Rendering**: Fix for server side rendering when setting enforce_domain to true [#6769](https://github.com/grafana/grafana/issues/6769)
 * **Webhooks**: Add content type json to outgoing webhooks [#6822](https://github.com/grafana/grafana/issues/6822)
 * **Keyboard shortcut**: Fixed zoom out shortcut [#6837](https://github.com/grafana/grafana/issues/6837)
+* **Webdav**: Adds basic auth headers to webdav uploader [#6779](https://github.com/grafana/grafana/issues/6779)
 
 # 4.0.1 (2016-12-02)
 
diff --git a/conf/defaults.ini b/conf/defaults.ini
@@ -67,6 +67,7 @@ type = sqlite3
 host = 127.0.0.1:3306
 name = grafana
 user = root
+# If the password contains # or ; you have to wrap it with trippel quotes. Ex """#password;"""
 password =
 # Use either URL or the previous fields to configure the database
 # Example: mysql://user:secret@host:port/database
diff --git a/conf/sample.ini b/conf/sample.ini
@@ -69,6 +69,7 @@
 ;host = 127.0.0.1:3306
 ;name = grafana
 ;user = root
+# If the password contains # or ; you have to wrap it with trippel quotes. Ex """#password;"""
 ;password =
 
 # Use either URL or the previous fields to configure the database
diff --git a/docs/sources/installation/configuration.md b/docs/sources/installation/configuration.md
@@ -170,7 +170,7 @@ The database user (not applicable for `sqlite3`).
 
 ### password
 
-The database user's password (not applicable for `sqlite3`).
+The database user's password (not applicable for `sqlite3`). If the password contains `#` or `;` you have to wrap it with trippel quotes. Ex `"""#password;"""`
 
 ### ssl_mode
 
diff --git a/pkg/metrics/gauge.go b/pkg/metrics/gauge.go
@@ -32,8 +32,8 @@ func RegGauge(name string, tagStrings ...string) Gauge {
 
 // GaugeSnapshot is a read-only copy of another Gauge.
 type GaugeSnapshot struct {
-	*MetricMeta
 	value int64
+	*MetricMeta
 }
 
 // Snapshot returns the snapshot.

Original file line number	Diff line number	Diff line change
`@@ -32,8 +32,8 @@ func RegGauge(name string, tagStrings ...string) Gauge {`
`32`	`32`
`33`	`33`	`// GaugeSnapshot is a read-only copy of another Gauge.`
`34`	`34`	`type GaugeSnapshot struct {`
`35`		`- *MetricMeta`
`36`	`35`	`value int64`
	`36`	`+ *MetricMeta`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`// Snapshot returns the snapshot.`