Merge branch 'v3.0.x'

This commit is contained in:
Torkel Ödegaard
2016-05-17 08:40:28 +02:00
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -14,6 +14,6 @@ CONF_DIR=/etc/grafana
CONF_FILE=/etc/grafana/grafana.ini
RESTART_ON_UPGRADE=true
RESTART_ON_UPGRADE=false
PLUGINS_DIR=/var/lib/grafana/plugins
+1 -1
View File
@@ -14,6 +14,6 @@ CONF_DIR=/etc/grafana
CONF_FILE=/etc/grafana/grafana.ini
RESTART_ON_UPGRADE=true
RESTART_ON_UPGRADE=false
PLUGINS_DIR=/var/lib/grafana/plugins