Torkel Ödegaard b8081b29fd Merge branch 'master' into grafana-annotations

2016-09-08 11:26:55 +02:00

..

alerting

Merge branch 'master' into grafana-annotations

2016-09-08 11:26:55 +02:00

annotations

feat(annotations): added support to show grafana stored annotations in graphs, #5982

2016-09-08 11:25:45 +02:00

eventpublisher

no unbound recursion in publish()

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

notifications

test(emails): update fake data model

2016-09-07 13:47:57 +02:00

search

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

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

sqlstore

feat(annotations): added support to show grafana stored annotations in graphs, #5982

2016-09-08 11:25:45 +02:00