Merge pull request #2168 from maryamtahhan/feat_libvirt_upstream

author Ruben Kerkhof <ruben@rubenkerkhof.com>

Mon, 10 Apr 2017 08:27:31 +0000 (10:27 +0200)

committer GitHub <noreply@github.com>

Mon, 10 Apr 2017 08:27:31 +0000 (10:27 +0200)
author Ruben Kerkhof <ruben@rubenkerkhof.com>
Mon, 10 Apr 2017 08:27:31 +0000 (10:27 +0200)
committer GitHub <noreply@github.com>
Mon, 10 Apr 2017 08:27:31 +0000 (10:27 +0200)
diff --cc src/collectd.conf.in
Simple merge
diff --cc src/collectd.conf.pod
Simple merge
diff --cc src/virt.c
Simple merge
author	Ruben Kerkhof <ruben@rubenkerkhof.com>
	Mon, 10 Apr 2017 08:27:31 +0000 (10:27 +0200)
committer	GitHub <noreply@github.com>
	Mon, 10 Apr 2017 08:27:31 +0000 (10:27 +0200)
		1	2
src/collectd.conf.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/collectd.conf.pod	patch \|	diff1 \|	diff2 \|	blob \| history
src/virt.c	patch \|	diff1 \|	diff2 \|	blob \| history