Merge branch 'collectd-5.7' into collectd-5.8

author Ruben Kerkhof <ruben@rubenkerkhof.com>

Mon, 19 Feb 2018 15:14:01 +0000 (16:14 +0100)

committer Ruben Kerkhof <ruben@rubenkerkhof.com>

Mon, 19 Feb 2018 15:14:01 +0000 (16:14 +0100)
author Ruben Kerkhof <ruben@rubenkerkhof.com>
Mon, 19 Feb 2018 15:14:01 +0000 (16:14 +0100)
committer Ruben Kerkhof <ruben@rubenkerkhof.com>
Mon, 19 Feb 2018 15:14:01 +0000 (16:14 +0100)
diff --cc docs/BUILD.dpdkstat.md
Simple merge
diff --cc src/write_kafka.c
Simple merge
diff --cc src/write_prometheus.c
Simple merge
author	Ruben Kerkhof <ruben@rubenkerkhof.com>
	Mon, 19 Feb 2018 15:14:01 +0000 (16:14 +0100)
committer	Ruben Kerkhof <ruben@rubenkerkhof.com>
	Mon, 19 Feb 2018 15:14:01 +0000 (16:14 +0100)
		1	2
docs/BUILD.dpdkstat.md	patch \|	diff1 \|	diff2 \|	blob \| history
src/write_kafka.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/write_prometheus.c	patch \|	diff1 \|	diff2 \|	blob \| history