[tokkee]

tokkee.org

Code

projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2a4328b 9ee4ca8)
Merge branch 'collectd-5.4' into collectd-5.5
authorMarc Fournier <marc.fournier@camptocamp.com>
Wed, 25 May 2016 14:13:10 +0000 (16:13 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Wed, 25 May 2016 14:13:10 +0000 (16:13 +0200)
1  2 
src/processes.c patch | diff1 | diff2 | blob | history

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