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' of github.com:grafana/grafana

Browse Source
This commit is contained in:
Torkel Ödegaard 2016-04-10 14:59:03 -04:00
commit 788a0154d3
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/plugins/datasource/opentsdb/config_ctrl.ts
View File

@ -16,7 +16,7 @@ export class OpenTsConfigCtrl {
tsdbVersions = [ tsdbVersions = [
{name: '<=2.1', value: 1}, {name: '<=2.1', value: 1},
{name: '2.2', value: 2}, {name: '>=2.2', value: 2},
]; ];
tsdbResolutions = [ tsdbResolutions = [

1
public/app/plugins/panel/table/module.ts
View File

@ -218,6 +218,7 @@ class TablePanelCtrl extends MetricsPanelCtrl {
if (data) { if (data) {
renderPanel(); renderPanel();
} }
ctrl.renderingCompleted();
}); });
} }
} }