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

torkelo · torkelo · commit 788a0154d35b · 2016-04-10T14:59:03.000-04:00
diff --git a/public/app/plugins/datasource/opentsdb/config_ctrl.ts b/public/app/plugins/datasource/opentsdb/config_ctrl.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 = [
diff --git a/public/app/plugins/panel/table/module.ts b/public/app/plugins/panel/table/module.ts
@@ -218,6 +218,7 @@ class TablePanelCtrl extends MetricsPanelCtrl {
       if (data) {
         renderPanel();
       }
+      ctrl.renderingCompleted();
     });
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -218,6 +218,7 @@ class TablePanelCtrl extends MetricsPanelCtrl {`
`218`	`218`	`if (data) {`
`219`	`219`	`renderPanel();`
`220`	`220`	`}`
	`221`	`+ ctrl.renderingCompleted();`
`221`	`222`	`});`
`222`	`223`	`}`
`223`	`224`	`}`