Torkel Ödegaard f36a44c49a Merge branch 'master' into alerting_definitions ...

Conflicts:
	conf/defaults.ini
	pkg/api/dashboard.go

2016-06-06 08:43:01 +02:00

..

main.go

Merge branch 'master' into alerting_definitions

2016-06-06 08:43:01 +02:00

web.go

feat(instrumentation): work on settings model for internal metrics publishing, #4696

2016-06-02 14:32:17 +02:00