projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2a82b09 3d15f72)
Merge branch 'pr/2056'
authorFlorian Forster <octo@collectd.org>
Mon, 28 Nov 2016 08:03:12 +0000 (09:03 +0100)
committerFlorian Forster <octo@collectd.org>
Mon, 28 Nov 2016 08:03:12 +0000 (09:03 +0100)
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