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

diff --cc README
Simple merge
diff --cc src/collectd.conf.pod
Simple merge
collectd, the system statistics collection daemon