Torkel Ödegaard 572d35506b Removed some editor srv properites from data sources, they are not needed there anymore, they are in plugin.json, Closes #2283 %!s(int64=10) %!d(string=hai) anos
..
partials 87007994af Merge branch 'kairosdb-metric-text' of https://github.com/masaori335/grafana into kariosdb %!s(int64=10) %!d(string=hai) anos
datasource.js 572d35506b Removed some editor srv properites from data sources, they are not needed there anymore, they are in plugin.json, Closes #2283 %!s(int64=10) %!d(string=hai) anos
plugin.json 15188c4a88 Moved kairosdb data source to correct folder %!s(int64=10) %!d(string=hai) anos
queryCtrl.js df9403809b Fix conflict %!s(int64=10) %!d(string=hai) anos