[tokkee]

tokkee.org

Code

projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a349303 20426b7)
Merge branch 'ff/tcpconns'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 12 Oct 2007 16:57:51 +0000 (18:57 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 12 Oct 2007 16:57:51 +0000 (18:57 +0200)
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)