projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: aef15b6 b286b67)
Merge branch 'collectd-5.5'
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 20 May 2016 10:51:25 +0000 (12:51 +0200)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 20 May 2016 10:51:25 +0000 (12:51 +0200)
1  2 
src/daemon/utils_cache.c patch | diff1 | diff2 | blob | history
src/exec.c patch | diff1 | diff2 | blob | history

diff --cc src/daemon/utils_cache.c
Simple merge
diff --cc src/exec.c
Simple merge
collectd, the system statistics collection daemon