Fabian Reinartz 8ffc851147 Merge branch 'master' into dev-2.0

2017-04-04 15:17:56 +02:00

..

alerting_test.go

rules: fix tests, remove model types

2016-12-29 17:31:14 +01:00

alerting.go

rules: fix tests, remove model types

2016-12-29 17:31:14 +01:00

manager_test.go

rules: fix tests, remove model types

2016-12-29 17:31:14 +01:00

manager.go

Merge branch 'master' into dev-2.0

2017-04-04 15:17:56 +02:00

recording_test.go

rules: fix tests, remove model types

2016-12-29 17:31:14 +01:00

recording.go

rules: fix tests, remove model types

2016-12-29 17:31:14 +01:00