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

..

defaults.ini

Merge branch 'master' into alerting_definitions

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

ldap.toml

new config option for source of %s in group_search_filter, useful for nested LDAP groups

2016-03-23 08:21:25 -04:00

sample.ini

feat(instrumentation): documented instrumentation options, closes #4696

2016-06-03 18:38:19 +02:00