[tokkee]

tokkee.org

Code

projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dff1246 098845e)
Merge branch 'sh/postgres-queries'
authorFlorian Forster <octo@collectd.org>
Sat, 17 Nov 2012 08:28:39 +0000 (09:28 +0100)
committerFlorian Forster <octo@collectd.org>
Sat, 17 Nov 2012 08:28:39 +0000 (09:28 +0100)
1  2 
src/collectd.conf.pod patch | diff1 | diff2 | blob | history

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