Code

Merge branch 'collectd-5.4' into collectd-5.5
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 20 May 2016 10:50:02 +0000 (12:50 +0200)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 20 May 2016 10:50:02 +0000 (12:50 +0200)
commitb286b677bb54a3192a4121c2aa0857a133fd0603
treeada9fcf22543e82f8bd9c88917e82e0868657f66
parent56536633afb68ded68ac7bd012060cb9337fbcc5
parentfcccdd28cd71d982421c72f306d106928d6c5fbd
Merge branch 'collectd-5.4' into collectd-5.5
src/daemon/utils_cache.c
src/exec.c