Merge pull request #2618 from ajssmith/amqp1_dev1_branch

author Ruben Kerkhof <ruben@rubenkerkhof.com>

Thu, 24 May 2018 09:06:55 +0000 (11:06 +0200)

committer GitHub <noreply@github.com>

Thu, 24 May 2018 09:06:55 +0000 (11:06 +0200)
author Ruben Kerkhof <ruben@rubenkerkhof.com>
Thu, 24 May 2018 09:06:55 +0000 (11:06 +0200)
committer GitHub <noreply@github.com>
Thu, 24 May 2018 09:06:55 +0000 (11:06 +0200)
diff --cc Makefile.am
Simple merge
diff --cc README
Simple merge
diff --cc configure.ac
Simple merge
diff --cc contrib/redhat/collectd.spec
Simple merge
diff --cc src/collectd.conf.in
Simple merge
diff --cc src/collectd.conf.pod
Simple merge
author	Ruben Kerkhof <ruben@rubenkerkhof.com>
	Thu, 24 May 2018 09:06:55 +0000 (11:06 +0200)
committer	GitHub <noreply@github.com>
	Thu, 24 May 2018 09:06:55 +0000 (11:06 +0200)
		1	2
Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
README	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
contrib/redhat/collectd.spec	patch \|	diff1 \|	diff2 \|	blob \| history
src/collectd.conf.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/collectd.conf.pod	patch \|	diff1 \|	diff2 \|	blob \| history