IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.7.x'

Browse Source
This commit is contained in:
Torkel Ödegaard 2014-08-11 13:43:05 +02:00
commit a242c40b23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

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

2
src/app/services/influxdb/influxdbDatasource.js
View File

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