]> git.tokkee.org Git - collectd.git/commitdiff
[tokkee]

tokkee.org

Code

projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3e36ac3 03542f9)
Merge branch 'pr/1918'
authorFlorian Forster <octo@collectd.org>
Fri, 16 Sep 2016 08:50:34 +0000 (10:50 +0200)
committerFlorian Forster <octo@collectd.org>
Fri, 16 Sep 2016 08:50:34 +0000 (10:50 +0200)
1  2 
src/collectd.conf.pod patch | diff1 | diff2 | blob | history

diff --cc src/collectd.conf.pod
Simple merge
statistics collection and monitoring daemon (clone)