[tokkee]

tokkee.org

Code

projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1882e31 6d86a97)
Merge branch 'collectd-4.6'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 9 Mar 2009 17:48:12 +0000 (18:48 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 9 Mar 2009 17:48:12 +0000 (18:48 +0100)
1  2 
README patch | diff1 | diff2 | blob | history
src/collectd.conf.pod patch | diff1 | diff2 | blob | history
src/rrdtool.c patch | diff1 | diff2 | blob | history

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