Merge branch 'collectd-5.6'
authorFlorian Forster <octo@collectd.org>
Mon, 7 Nov 2016 07:52:38 +0000 (08:52 +0100)
committerFlorian Forster <octo@collectd.org>
Mon, 7 Nov 2016 07:52:38 +0000 (08:52 +0100)
commit41288c6a9ed050b41ad47184aa1b53668c3588cc
tree09bfc143fec40be91e0feec552c732190ab4a148
parentc442c66d9e98852f1b8eaa1b816d6ee7f84d0342
parent1326af38b3ef25c41c994cd76c043202636b3d70
Merge branch 'collectd-5.6'
configure.ac
src/apcups.c
src/modbus.c
src/write_kafka.c