Merge pull request #3398 from mbakhoff/sensu-source

author Matthias Runge <mrunge@redhat.com>

Wed, 6 May 2020 17:01:31 +0000 (19:01 +0200)

committer GitHub <noreply@github.com>

Wed, 6 May 2020 17:01:31 +0000 (19:01 +0200)
author Matthias Runge <mrunge@redhat.com>
Wed, 6 May 2020 17:01:31 +0000 (19:01 +0200)
committer GitHub <noreply@github.com>
Wed, 6 May 2020 17:01:31 +0000 (19:01 +0200)
diff --cc src/collectd.conf.in
Simple merge
diff --cc src/collectd.conf.pod
Simple merge
author	Matthias Runge <mrunge@redhat.com>
	Wed, 6 May 2020 17:01:31 +0000 (19:01 +0200)
committer	GitHub <noreply@github.com>
	Wed, 6 May 2020 17:01:31 +0000 (19:01 +0200)
		1	2
src/collectd.conf.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/collectd.conf.pod	patch \|	diff1 \|	diff2 \|	blob \| history