Merge branch 'master' of github.com:grafana/grafana

This commit is contained in:
Torkel Ödegaard
2017-12-15 14:55:50 +01:00
@@ -23,7 +23,7 @@ class PrometheusQueryCtrl extends QueryCtrl {
var target = this.target;
target.expr = target.expr || '';
target.intervalFactor = target.intervalFactor || 2;
target.intervalFactor = target.intervalFactor || 1;
target.format = target.format || this.getDefaultFormat();
this.metric = '';