Merge branch 'master' into feature/add_es_alerting

This commit is contained in:
Marcus Efraimsson
2018-05-28 18:10:34 +02:00
443 changed files with 35782 additions and 17849 deletions
+1
View File
@@ -33,6 +33,7 @@ import (
_ "github.com/grafana/grafana/pkg/services/cleanup"
_ "github.com/grafana/grafana/pkg/services/notifications"
_ "github.com/grafana/grafana/pkg/services/provisioning"
_ "github.com/grafana/grafana/pkg/services/rendering"
_ "github.com/grafana/grafana/pkg/services/search"
_ "github.com/grafana/grafana/pkg/services/sqlstore"
_ "github.com/grafana/grafana/pkg/tracing"