Merge branch 'collectd-5.6' into collectd-5.7
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 24 Feb 2017 16:44:55 +0000 (17:44 +0100)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 24 Feb 2017 16:44:55 +0000 (17:44 +0100)
commit11c8a760c2d354b2f4637bdb297efb253bfaa519
treecb1a459bbc351d4b2839e7aa472bd18635f47086
parent004074af297a219208fa9e903db8c5dcdd7e1950
parent6cb7fdcc48e913ee293f27a6f16a3acc0c1bab05
Merge branch 'collectd-5.6' into collectd-5.7
configure.ac
src/daemon/common.c
src/daemon/common.h