[tokkee]

tokkee.org

Code

projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2cf1055 d1af4d9)
Merge branch 'collectd-5.4' into collectd-5.5
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 18 Mar 2016 12:03:37 +0000 (13:03 +0100)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 18 Mar 2016 12:03:37 +0000 (13:03 +0100)
1  2 
src/collectd-exec.pod patch | diff1 | diff2 | blob | history

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