public/app/plugins/datasource · 106fe4854f818bc53b27c1c06ef01913a355edcc · Kornkitt Poolsup / nexpie-grafana-theme

Merge branch 'prometheus' of github.com:grafana/grafana · 106fe485

Conflicts:
	pkg/models/datasource.go
	public/app/plugins/datasource/prometheus/datasource.js
	public/app/plugins/datasource/prometheus/partials/query.editor.html
	public/app/plugins/datasource/prometheus/queryCtrl.js

committed Oct 06, 2015

106fe485

Name	Last commit	Last Update
..
cloudwatch		Loading commit data...
elasticsearch		Loading commit data...
grafana		Loading commit data...
graphite		Loading commit data...
influxdb		Loading commit data...
influxdb_08		Loading commit data...
kairosdb		Loading commit data...
mixed		Loading commit data...
opentsdb		Loading commit data...
prometheus		Loading commit data...
sql		Loading commit data...