Torkel Ödegaard 9f29c54170 Merge branch 'query_part_refactor' into alerting ...

Conflicts:
	pkg/services/sqlstore/migrations/alert_mig.go
	pkg/services/sqlstore/migrations/heartbeat_mig.go

2016-08-15 17:54:42 +02:00

..

alerting

Merge branch 'query_part_refactor' into alerting

2016-08-15 17:54:42 +02:00

annotations

feat(query_part): refactoring query part

2016-08-15 17:20:45 +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

Merge branch 'query_part_refactor' into alerting

2016-08-15 17:54:42 +02:00