Merge pull request #2199 from jaroug/support_attributes_kairosdb

author Ruben Kerkhof <ruben@rubenkerkhof.com>

Sun, 26 Mar 2017 13:36:09 +0000 (15:36 +0200)

committer GitHub <noreply@github.com>

Sun, 26 Mar 2017 13:36:09 +0000 (15:36 +0200)
author Ruben Kerkhof <ruben@rubenkerkhof.com>
Sun, 26 Mar 2017 13:36:09 +0000 (15:36 +0200)
committer GitHub <noreply@github.com>
Sun, 26 Mar 2017 13:36:09 +0000 (15:36 +0200)
diff --cc src/collectd.conf.in
Simple merge
diff --cc src/collectd.conf.pod
Simple merge
author	Ruben Kerkhof <ruben@rubenkerkhof.com>
	Sun, 26 Mar 2017 13:36:09 +0000 (15:36 +0200)
committer	GitHub <noreply@github.com>
	Sun, 26 Mar 2017 13:36:09 +0000 (15:36 +0200)
		1	2
src/collectd.conf.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/collectd.conf.pod	patch \|	diff1 \|	diff2 \|	blob \| history