Merge branch 'collectd-5.8'

author Florian Forster <octo@collectd.org>

Sat, 18 Nov 2017 08:56:30 +0000 (09:56 +0100)

committer Florian Forster <octo@collectd.org>

Sat, 18 Nov 2017 08:56:30 +0000 (09:56 +0100)
author Florian Forster <octo@collectd.org>
Sat, 18 Nov 2017 08:56:30 +0000 (09:56 +0100)
committer Florian Forster <octo@collectd.org>
Sat, 18 Nov 2017 08:56:30 +0000 (09:56 +0100)
diff --cc src/mcelog.c
Simple merge
diff --cc src/processes.c
Simple merge
diff --cc src/utils_ovs.c
Simple merge
diff --cc src/zfs_arc.c
Simple merge
author	Florian Forster <octo@collectd.org>
	Sat, 18 Nov 2017 08:56:30 +0000 (09:56 +0100)
committer	Florian Forster <octo@collectd.org>
	Sat, 18 Nov 2017 08:56:30 +0000 (09:56 +0100)
		1	2
src/mcelog.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/processes.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/utils_ovs.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/zfs_arc.c	patch \|	diff1 \|	diff2 \|	blob \| history