From: Pavel Rochnyack Date: Sun, 2 Dec 2018 18:24:36 +0000 (+0700) Subject: virt: Merge changes from master to resolve conflict X-Git-Tag: collectd-5.9.0~84^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d1fc8f895b30d6a4f868e560c68dbf4f5bd03c3;p=thirdparty%2Fcollectd.git virt: Merge changes from master to resolve conflict --- 5d1fc8f895b30d6a4f868e560c68dbf4f5bd03c3