Merge branch '1.7.x'

CHANGELOG.md

@@ -1,4 +1,4 @@
-# 1.7.0 (unreleased)
+# 1.7.0 (2014-08-11)
 
 **Fixes**
 - [Issue #652](https://github.com/grafana/grafana/issues/652). Timepicker: Entering custom date range impossible when refresh is low (now is constantly reset)

src/app/services/influxdb/influxdbDatasource.js

@@ -228,7 +228,7 @@ function (angular, _, kbn, InfluxSeries) {
           inspect: { type: 'influxdb' },
         };
 
-        return $http(options).then(function (data) {
+        return $http(options).success(function (data) {
           deferred.resolve(data);
         });
       }, 10);