Torkel Ödegaard b0fe69822a Merge branch 'master' into alerting ...

Conflicts:
	public/app/core/services/alert_srv.ts
	public/app/partials/confirm_modal.html

2016-07-18 18:22:35 +02:00

..

cloudwatch

(cloudwatch) assume role support (#5065)

2016-05-18 07:54:24 +02:00

elasticsearch

Merge branch 'elasticsearch_precision_threshold' of https://github.com/lucasrodcosta/grafana into lucasrodcosta-elasticsearch_precision_threshold

2016-07-18 13:56:34 +02:00

grafana

feat(query editors): changed chevron position

2016-04-27 21:24:41 +02:00

grafana-live

feat(alerting): work on alerting

2016-07-14 13:32:16 +02:00

graphite

Do not substitute #[A-Z] in graphite target when invalid ref (#5581)

2016-07-14 10:29:22 +02:00

influxdb

Avoid to request influxdb when query is hidden

2016-06-23 13:11:16 +02:00

mixed

feat(plugins): adds a readme for every native plugin

2016-03-30 23:33:30 +02:00

opentsdb

OpenTSDB: consistent options for http requests (#5233)

2016-06-17 14:04:40 +02:00

prometheus

fix(prometheus): fixed svg link in prometheus dashboard, fixes #5604

2016-07-18 16:27:02 +02:00