Merge pull request #2874 from elfiesmelfie/feat_virt_block_info

author Pavel Rochnyak <pavel2000@ngs.ru>

Thu, 7 Mar 2019 18:26:15 +0000 (01:26 +0700)

committer GitHub <noreply@github.com>

Thu, 7 Mar 2019 18:26:15 +0000 (01:26 +0700)
author Pavel Rochnyak <pavel2000@ngs.ru>
Thu, 7 Mar 2019 18:26:15 +0000 (01:26 +0700)
committer GitHub <noreply@github.com>
Thu, 7 Mar 2019 18:26:15 +0000 (01:26 +0700)
diff --cc src/collectd.conf.pod
Simple merge
diff --cc src/virt.c
Simple merge
author	Pavel Rochnyak <pavel2000@ngs.ru>
	Thu, 7 Mar 2019 18:26:15 +0000 (01:26 +0700)
committer	GitHub <noreply@github.com>
	Thu, 7 Mar 2019 18:26:15 +0000 (01:26 +0700)
		1	2
src/collectd.conf.pod	patch \|	diff1 \|	diff2 \|	blob \| history
src/virt.c	patch \|	diff1 \|	diff2 \|	blob \| history