Merge branch 'collectd-5.7' into collectd-5.8
authorFlorian Forster <octo@collectd.org>
Thu, 30 Nov 2017 16:11:49 +0000 (17:11 +0100)
committerFlorian Forster <octo@collectd.org>
Thu, 30 Nov 2017 16:11:49 +0000 (17:11 +0100)
commit3d082a905619c19ca5b7183bb95a30d4d9529c4d
tree52f6863602ba76612924696bd041b73d0fadad26
parentae299c233838bb1d7ddcb4b2826b3352a12af7e7
parentff59046e8694bde7f4b965a5f6e35ed325572c82
Merge branch 'collectd-5.7' into collectd-5.8
src/aggregation.c
src/ping.c
src/target_set.c