public/app/plugins/datasource/elasticsearch · 5bdf0cd1362d8d44a6b15f7abd12bc5310e2ebd1 · Kornkitt Poolsup / nexpie-grafana-theme

Merge branch 'global_interval' of https://github.com/felixbarny/grafana into… · 5bdf0cd1

Merge branch 'global_interval' of https://github.com/felixbarny/grafana into felixbarny-global_interval

Conflicts:
	public/app/plugins/datasource/elasticsearch/partials/config.html

committed Dec 17, 2015

5bdf0cd1

Name	Last commit	Last Update
..
partials		Loading commit data...
specs		Loading commit data...
bucket_agg.js		Loading commit data...
datasource.js		Loading commit data...
directives.js		Loading commit data...
elastic_response.js		Loading commit data...
index_pattern.js		Loading commit data...
metric_agg.js		Loading commit data...
plugin.json		Loading commit data...
query_builder.js		Loading commit data...
query_ctrl.js		Loading commit data...
query_def.js		Loading commit data...