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)
commit826293bf3acfdcee6632f5d8f0b6be013f2cebab
treef58c37d5989f69e1fd8378bb2f6f5a83b7632dd4
parentaef15b632b9f415e5ebfadd4e41fa8a3c19407ee
parentb286b677bb54a3192a4121c2aa0857a133fd0603
Merge branch 'collectd-5.5'
src/daemon/utils_cache.c
src/exec.c