]> 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: 3f0678c c15031c)
Merge branch 'ph/ipmi'
authorFlorian Forster <octo@huhu.verplant.org>
Tue, 19 Aug 2008 09:19:08 +0000 (11:19 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Tue, 19 Aug 2008 09:19:08 +0000 (11:19 +0200)
1  2 
AUTHORS patch | diff1 | diff2 | blob | history
src/collectd.conf.pod patch | diff1 | diff2 | blob | history

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