From 2fbb87e17a3db03c9791d6cd001e1b884acb101d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Tue, 17 Jun 2014 18:09:10 +0200
Subject: [PATCH] fix jshint and updated changelog with PR #500

---
 CHANGELOG.md                                    | 8 +++++++-
 latest.json                                     | 4 ++--
 src/app/services/influxdb/influxdbDatasource.js | 2 +-
 src/config.sample.js                            | 7 +++----
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index db2a1bd1792..633288a0588 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,10 @@
-# vNext
+vNext
+
+**Fixes**
+
+- Fixes regex InfluxDB queries intoduced in 1.6.0 (PR #500)
+
+# 1.6.0 (2014-06-16)
 
 #### New features or improvements
 - New Y-axis formater for metric values that represent seconds (Issue #427) - thx @jippi
diff --git a/latest.json b/latest.json
index 0db600fdcc6..458f3ba8903 100644
--- a/latest.json
+++ b/latest.json
@@ -1,4 +1,4 @@
 {
-	"version": "1.5.4",
-	"url": "http://grafanarel.s3.amazonaws.com/grafana-1.5.4.tar.gz"
+	"version": "1.6.0",
+	"url": "http://grafanarel.s3.amazonaws.com/grafana-1.6.0.tar.gz"
 }
\ No newline at end of file
diff --git a/src/app/services/influxdb/influxdbDatasource.js b/src/app/services/influxdb/influxdbDatasource.js
index 3c95f5fc220..af7a81352be 100644
--- a/src/app/services/influxdb/influxdbDatasource.js
+++ b/src/app/services/influxdb/influxdbDatasource.js
@@ -87,7 +87,7 @@ function (angular, _, kbn) {
           };
 
           if(!templateData.series.match('^/.*/')) {
-                  templateData.series = '"' + templateData.series + '"';
+            templateData.series = '"' + templateData.series + '"';
           }
 
           query = _.template(template, templateData, this.templateSettings);
diff --git a/src/config.sample.js b/src/config.sample.js
index d2893a0c21e..98f3ad41ed9 100644
--- a/src/config.sample.js
+++ b/src/config.sample.js
@@ -32,6 +32,9 @@ function (Settings) {
     // default start dashboard
     default_route: '/dashboard/file/default.json',
 
+    // Elasticsearch index for storing dashboards
+    grafana_index: "grafana-dash",
+
     // timezoneOFfset:
     // If you experiance problems with zoom, it is probably caused by timezone diff between
     // your browser and the graphite-web application. timezoneOffset setting can be used to have Grafana
@@ -44,9 +47,6 @@ function (Settings) {
     //
     timezoneOffset: null,
 
-    // Elasticsearch index for storing dashboards
-    grafana_index: "grafana-dash",
-
     // set to false to disable unsaved changes warning
     unsaved_changes_warning: true,
 
@@ -54,7 +54,6 @@ function (Settings) {
     // Example: "1m", "1h"
     playlist_timespan: "1m",
 
-
     // Add your own custom pannels
     plugins: {
       panels: []