projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c599624 6a151af)
Merge remote-tracking branch 'github/pr/1924'
authorFlorian Forster <octo@collectd.org>
Mon, 12 Sep 2016 05:56:26 +0000 (07:56 +0200)
committerFlorian Forster <octo@collectd.org>
Mon, 12 Sep 2016 05:56:26 +0000 (07:56 +0200)
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