From: Pavel Rochnyack Date: Sun, 2 Dec 2018 18:24:36 +0000 (+0700) Subject: virt: Merge changes from master to resolve conflict X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=5d1fc8f895b30d6a4f868e560c68dbf4f5bd03c3 virt: Merge changes from master to resolve conflict --- 5d1fc8f895b30d6a4f868e560c68dbf4f5bd03c3