[tokkee]

tokkee.org

Code

projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 24640dc aee1cc1)
Merge branch 'collectd-5.4' into collectd-5.5
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Wed, 25 May 2016 14:53:06 +0000 (16:53 +0200)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Wed, 25 May 2016 14:53:06 +0000 (16:53 +0200)
1  2 
src/processes.c patch | diff1 | diff2 | blob | history

diff --cc src/processes.c
Simple merge
statistics collection and monitoring daemon (clone)