virt: Merge changes from master to resolve conflict
authorPavel Rochnyack <pavel2000@ngs.ru>
Sun, 2 Dec 2018 18:24:36 +0000 (01:24 +0700)
committerPavel Rochnyack <pavel2000@ngs.ru>
Sun, 2 Dec 2018 18:24:36 +0000 (01:24 +0700)
commit5d1fc8f895b30d6a4f868e560c68dbf4f5bd03c3
treec21ad073e7f6429a585d868305bb115e1c41e5ca
parentd3eae6bf3df995566cad90c96a1dea49652b5dd2
parent854351fef35725606cc89b515cac6495080457e2
virt: Merge changes from master to resolve conflict
src/collectd.conf.pod