[tokkee]

tokkee.org

Code

projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 21d1254 5dc8a8c)
Merge branch 'document-varnish-instance-block' into collectd-5.2
authorFlorian Forster <octo@collectd.org>
Sat, 25 May 2013 18:15:59 +0000 (20:15 +0200)
committerFlorian Forster <octo@collectd.org>
Sat, 25 May 2013 18:15:59 +0000 (20:15 +0200)
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)