Commit 2fbb87e1 by Torkel Ödegaard

fix jshint and updated changelog with PR #500

parent 1eadf52f
# 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 features or improvements
- New Y-axis formater for metric values that represent seconds (Issue #427) - thx @jippi - New Y-axis formater for metric values that represent seconds (Issue #427) - thx @jippi
......
{ {
"version": "1.5.4", "version": "1.6.0",
"url": "http://grafanarel.s3.amazonaws.com/grafana-1.5.4.tar.gz" "url": "http://grafanarel.s3.amazonaws.com/grafana-1.6.0.tar.gz"
} }
\ No newline at end of file
...@@ -32,6 +32,9 @@ function (Settings) { ...@@ -32,6 +32,9 @@ function (Settings) {
// default start dashboard // default start dashboard
default_route: '/dashboard/file/default.json', default_route: '/dashboard/file/default.json',
// Elasticsearch index for storing dashboards
grafana_index: "grafana-dash",
// timezoneOFfset: // timezoneOFfset:
// If you experiance problems with zoom, it is probably caused by timezone diff between // 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 // your browser and the graphite-web application. timezoneOffset setting can be used to have Grafana
...@@ -44,9 +47,6 @@ function (Settings) { ...@@ -44,9 +47,6 @@ function (Settings) {
// //
timezoneOffset: null, timezoneOffset: null,
// Elasticsearch index for storing dashboards
grafana_index: "grafana-dash",
// set to false to disable unsaved changes warning // set to false to disable unsaved changes warning
unsaved_changes_warning: true, unsaved_changes_warning: true,
...@@ -54,7 +54,6 @@ function (Settings) { ...@@ -54,7 +54,6 @@ function (Settings) {
// Example: "1m", "1h" // Example: "1m", "1h"
playlist_timespan: "1m", playlist_timespan: "1m",
// Add your own custom pannels // Add your own custom pannels
plugins: { plugins: {
panels: [] panels: []
......
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