[tokkee]

tokkee.org

Code

projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9b4f132 5b0b730)
Merge remote-tracking branch 'github/pr/1067'
authorFlorian Forster <octo@collectd.org>
Tue, 9 Jun 2015 17:10:55 +0000 (18:10 +0100)
committerFlorian Forster <octo@collectd.org>
Tue, 9 Jun 2015 17:10:55 +0000 (18:10 +0100)
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)