Merge branch 'master' into docs-5.1

This commit is contained in:
Marcus Efraimsson 2018-04-13 16:40:38 +02:00
commit 48143d6caf
No known key found for this signature in database
GPG Key ID: EBFE0FB04612DD4A

View File

@ -273,7 +273,8 @@ datasources:
url: localhost:5432
database: grafana
user: grafana
password: password
secureJsonData:
password: "Password!"
jsonData:
sslmode: "disable" # disable/require/verify-ca/verify-full