Torkel Ödegaard f9b628ad0e Merge branch 'v3.1.x' ...

Conflicts:
	conf/defaults.ini
	conf/sample.ini
	pkg/metrics/graphite.go
	pkg/metrics/graphite_test.go

2016-08-17 09:53:46 +02:00

..

defaults.ini

Merge branch 'v3.1.x'

2016-08-17 09:53:46 +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

Merge branch 'v3.1.x'

2016-08-17 09:53:46 +02:00