Torkel Ödegaard fc8f0721cd Merge branch 'master' of github.com:grafana/grafana ...

Conflicts:
	pkg/services/alerting/eval_context.go

2016-09-06 20:40:49 +02:00

..

alerting

Merge branch 'master' of github.com:grafana/grafana

2016-09-06 20:40:49 +02:00

annotations

feat(alerting): add alert history api endpoint

2016-08-30 09:32:56 +02:00

eventpublisher

no unbound recursion in publish()

2015-05-18 10:04:01 -04:00

notifications

feat(alerting): list all series in alert email

2016-08-13 12:50:51 +02:00

search

Revert "Enable the "limit" param in /api/search"

2016-06-17 11:22:39 +02:00

sqlstore

feat(alerting): progress on handling no data in alert query, #5860

2016-09-06 20:40:12 +02:00