]> 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: 26fbc23 84b91b4)
Merge remote-tracking branch 'tokkee/sh/collectd-5.0' into collectd-5.0
authorFlorian Forster <octo@collectd.org>
Sat, 28 Jan 2012 11:03:35 +0000 (12:03 +0100)
committerFlorian Forster <octo@collectd.org>
Sat, 28 Jan 2012 11:03:35 +0000 (12:03 +0100)
1  2 
src/collectd.conf.in patch | diff1 | diff2 | blob | history

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