[tokkee]

tokkee.org

Code

projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6bd4bf7 60f3ab3)
Merge branch 'ff/swap'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 7 Feb 2011 07:42:05 +0000 (08:42 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 7 Feb 2011 07:42:05 +0000 (08:42 +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)