public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into alerting_definitions

Browse Source
This commit is contained in:
bergquist
2016-06-03 12:22:46 +02:00
parent 5bbfe39f84 15aeb4aec2
commit d0ac258474
24 changed files with 74 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/defaults.ini
+1 -1
View File
@@ -143,7 +143,7 @@ cookie_remember_name = grafana_remember
# disable gravatar profile images
disable_gravatar = false
# data source proxy whitelist (ip_or_domain:port seperated by spaces)
# data source proxy whitelist (ip_or_domain:port separated by spaces)
data_source_proxy_whitelist =
[snapshots]