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

2016-06-08 08:10:22 +02:00
parent b25cb60259 22cda198ae
commit 7d6cda4916
3 changed files with 4 additions and 4 deletions
@@ -258,7 +258,7 @@ check_for_updates = true
 # Expired days of log file(delete after max days), default is 7
 ;max_days = 7

-#################################### AMPQ Event Publisher ##########################
+#################################### AMQP Event Publisher ##########################
 [event_publisher]
 ;enabled = false
 ;rabbitmq_url = amqp://localhost/