瀏覽代碼

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

Torkel Ödegaard 9 年之前
父節點
當前提交
788a0154d3
共有 2 個文件被更改,包括 2 次插入1 次删除
  1. 1 1
      public/app/plugins/datasource/opentsdb/config_ctrl.ts
  2. 1 0
      public/app/plugins/panel/table/module.ts

+ 1 - 1
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 = [

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

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