Merge branch 'master' into docs-5.1

48143d6c · Marcus Efraimsson · 9c492bd7 · 511b34eb · 48143d6c
Commit 48143d6c authored Apr 13, 2018 by Marcus Efraimsson
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletions

docs/sources/features/datasources/postgres.md
+2 -1

No files found.
--- a/docs/sources/features/datasources/postgres.md
+++ b/docs/sources/features/datasources/postgres.md
@@ -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