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 'master' into develop

Browse Source
This commit is contained in:
Torkel Ödegaard
2018-11-20 09:47:23 +01:00
parent f44e634da4 cab2c5189a
commit 649d727805
104 changed files with 3398 additions and 841 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/features/panel/metrics_tab.ts
View File

@@ -82,7 +82,6 @@ export class MetricsTabCtrl {
return;
}
this.datasourceInstance = option.datasource;
this.setDatasource(option.datasource);
this.updateDatasourceOptions();
}
@@ -102,6 +101,7 @@ export class MetricsTabCtrl {
});
}
this.datasourceInstance = datasource;
this.panel.datasource = datasource.value;
this.panel.refresh();
}