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

788a0154 · Torkel Ödegaard · a8f4b022 · cdf8c0fa · 788a0154 · 788a0154
Commit 788a0154 authored Apr 10, 2016 by Torkel Ödegaard
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletions

public/app/plugins/datasource/opentsdb/config_ctrl.ts
+1 -1

public/app/plugins/panel/table/module.ts
+1 -0

No files found.
--- 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 = [

--- 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();
    });
  }
 }