IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-12-30 10:47:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix conflict

Browse Source
This commit is contained in:
Masaori Koshiba 2015-04-26 23:14:50 +09:00
parent d86814b6c5
commit df9403809b
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
public/app/plugins/datasource/kairosdb/queryCtrl.js
View File

@ -8,7 +8,6 @@ function (angular, _) {
var module = angular.module('grafana.controllers');
var metricList = [];
var tagList = [];
var targetLetters = ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O'];
module.controller('KairosDBQueryCtrl', function($scope) {
@ -21,8 +20,6 @@ function (angular, _) {
$scope.target.downsampling = $scope.panel.downsampling;
$scope.target.sampling = $scope.panel.sampling;
}
$scope.targetLetters = targetLetters;
$scope.updateMetricList();
$scope.target.errors = validateTarget($scope.target);
};