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

This commit is contained in:
Torkel Ödegaard
2018-02-16 09:14:44 +01:00
41 changed files with 223 additions and 185 deletions
+1 -1
View File
@@ -43,7 +43,7 @@ ssl_skip_verify = false
# Search user bind dn
bind_dn = "cn=admin,dc=grafana,dc=org"
# Search user bind password
# If the password contains # or ; you have to wrap it with trippel quotes. Ex """#password;"""
# If the password contains # or ; you have to wrap it with triple quotes. Ex """#password;"""
bind_password = 'grafana'
# User search filter, for example "(cn=%s)" or "(sAMAccountName=%s)" or "(uid=%s)"