Skip to content

Commit b8baeac

Browse files
committed
Merge branch 'master' of github.com:grafana/grafana
2 parents a425ce0 + 513aa61 commit b8baeac

File tree

3 files changed

+4
-1
lines changed

3 files changed

+4
-1
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
* **Table panel**: Fixed table panel bug when trying to show annotations in table panel, fixes [#4563](https://github.com/grafana/grafana/issues/4563)
66
* **App Config**: Fixed app config issue showing content of other app config, fixes [#4575](https://github.com/grafana/grafana/issues/4575)
77
* **Graph Panel**: Fixed legend option max not updating, fixes [#4601](https://github.com/grafana/grafana/issues/4601)
8+
* **Graph Panel**: Fixed issue where newly added graph panels shared same axes config, fixes [#4582](https://github.com/grafana/grafana/issues/4582)
89

910
# 3.0.0-beta2 (2016-04-04)
1011

public/app/features/panel/metrics_panel_ctrl.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ class MetricsPanelCtrl extends PanelCtrl {
8282
this.loading = true;
8383

8484
// load datasource service
85+
this.setTimeQueryStart();
8586
this.datasourceSrv.get(this.panel.datasource)
8687
.then(this.issueQueries.bind(this))
8788
.then(this.handleQueryResult.bind(this))

public/app/plugins/panel/graph/module.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import './legend';
55
import './series_overrides_ctrl';
66

77
import template from './template';
8+
import angular from 'angular';
89
import moment from 'moment';
910
import kbn from 'app/core/utils/kbn';
1011
import _ from 'lodash';
@@ -108,7 +109,7 @@ class GraphCtrl extends MetricsPanelCtrl {
108109
constructor($scope, $injector, private annotationsSrv) {
109110
super($scope, $injector);
110111

111-
_.defaults(this.panel, panelDefaults);
112+
_.defaults(this.panel, angular.copy(panelDefaults));
112113
_.defaults(this.panel.tooltip, panelDefaults.tooltip);
113114
_.defaults(this.panel.grid, panelDefaults.grid);
114115
_.defaults(this.panel.legend, panelDefaults.legend);

0 commit comments

Comments
 (0)