Commit 30cd782e by Torkel Ödegaard

fix(snapshot): Fix for snapshot with expire 7 days option, 7 days option not…

fix(snapshot): Fix for snapshot with expire 7 days option, 7 days option not correct, was 7 hours, fixes #2574
parent 3d37c9c9
...@@ -10,6 +10,7 @@ it allows you to add queries of differnet data source types & instances to the s ...@@ -10,6 +10,7 @@ it allows you to add queries of differnet data source types & instances to the s
- [Issue #1186](https://github.com/grafana/grafana/issues/1186). Time Picker: New option `today`, will set time range from midnight to now - [Issue #1186](https://github.com/grafana/grafana/issues/1186). Time Picker: New option `today`, will set time range from midnight to now
**Fixes** **Fixes**
- [Issue #2574](https://github.com/grafana/grafana/issues/2574). Snapshot: Fix for snapshot with expire 7 days option, 7 days option not correct, was 7 hours
- [Issue #2568](https://github.com/grafana/grafana/issues/2568). AuthProxy: Fix for server side rendering of panel when using auth proxy - [Issue #2568](https://github.com/grafana/grafana/issues/2568). AuthProxy: Fix for server side rendering of panel when using auth proxy
- [Issue #2490](https://github.com/grafana/grafana/issues/2490). Graphite: Dashboard import was broken in 2.1 and 2.1.1, working now - [Issue #2490](https://github.com/grafana/grafana/issues/2490). Graphite: Dashboard import was broken in 2.1 and 2.1.1, working now
- [Issue #2565](https://github.com/grafana/grafana/issues/2565). TimePicker: Fix for when you applied custom time range it did not refreh dashboard - [Issue #2565](https://github.com/grafana/grafana/issues/2565). TimePicker: Fix for when you applied custom time range it did not refreh dashboard
......
...@@ -19,7 +19,7 @@ function (angular, _) { ...@@ -19,7 +19,7 @@ function (angular, _) {
$scope.expireOptions = [ $scope.expireOptions = [
{text: '1 Hour', value: 60*60}, {text: '1 Hour', value: 60*60},
{text: '1 Day', value: 60*60*24}, {text: '1 Day', value: 60*60*24},
{text: '7 Days', value: 60*60*7}, {text: '7 Days', value: 60*60*24*7},
{text: 'Never', value: 0}, {text: 'Never', value: 0},
]; ];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment