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

pull/4653/merge
Torkel Ödegaard 9 years ago
commit 788a0154d3
  1. 2
      public/app/plugins/datasource/opentsdb/config_ctrl.ts
  2. 1
      public/app/plugins/panel/table/module.ts

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

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

Loading…
Cancel
Save