projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d3eae6b 854351f)
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)
1  2 
src/collectd.conf.pod patch | diff1 | diff2 | blob | history

diff --cc src/collectd.conf.pod
Simple merge
collectd, the system statistics collection daemon