From 70be33369145f3460754c6c4c6f0e241c9a8c914 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 11 Aug 2014 13:39:02 +0200 Subject: [PATCH 1/2] Last miniute fix for issue in influxdb http request calling --- src/app/services/influxdb/influxdbDatasource.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/services/influxdb/influxdbDatasource.js b/src/app/services/influxdb/influxdbDatasource.js index a835c7e6f3f..141ce5eba74 100644 --- a/src/app/services/influxdb/influxdbDatasource.js +++ b/src/app/services/influxdb/influxdbDatasource.js @@ -227,7 +227,7 @@ function (angular, _, kbn, InfluxSeries) { data: data }; - return $http(options).then(function (data) { + return $http(options).success(function (data) { deferred.resolve(data); }); }, 10); From f82b84eac7c09081280c634862dd8ed71827d30d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 11 Aug 2014 13:42:39 +0200 Subject: [PATCH 2/2] updated changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 667a2be7c0c..7ee8b7662a3 100644 --- a/CHANGELOG.md +++ b/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)