[tokkee]

tokkee.org

Code

projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e770968 26fbc23)
Merge branch 'collectd-5.0'
authorFlorian Forster <octo@collectd.org>
Sat, 21 Jan 2012 17:26:17 +0000 (18:26 +0100)
committerFlorian Forster <octo@collectd.org>
Sat, 21 Jan 2012 17:26:17 +0000 (18:26 +0100)
1  2 
ChangeLog patch | diff1 | diff2 | blob | history
src/collectd.conf.in patch | diff1 | diff2 | blob | history
src/collectd.conf.pod patch | diff1 | diff2 | blob | history

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