Merge branch 'v3.1.x'

2016-07-11 09:39:17 +02:00
parent 010dbddf59 65683ab241
commit 08202dcb83
32 changed files with 423 additions and 121 deletions
@@ -46,7 +46,7 @@ Then you can override them using:

 ## instance_name
 Set the name of the grafana-server instance. Used in logging and internal metrics and in
-clustering info. Defaults to: `${HOSTNAME}, which will be replaced with
+clustering info. Defaults to: `${HOSTNAME}`, which will be replaced with
 environment variable `HOSTNAME`, if that is empty or does not exist Grafana will try to use
 system calls to get the machine name.