Code

Merge branch 'collectd-5.5' into collectd-5.6
authorFlorian Forster <octo@collectd.org>
Mon, 7 Nov 2016 07:43:17 +0000 (08:43 +0100)
committerFlorian Forster <octo@collectd.org>
Mon, 7 Nov 2016 07:48:45 +0000 (08:48 +0100)
commit1326af38b3ef25c41c994cd76c043202636b3d70
treeaa78ad116470823c894d92574e8aa585871cdfae
parent4979d8dcd6f097eb8fd4661086e28accd31ff905
parent68d6aff96c029c9a455b7a0146c788af08f9ff22
Merge branch 'collectd-5.5' into collectd-5.6
configure.ac
src/apcups.c
src/modbus.c
src/write_kafka.c
src/write_riemann.c
src/write_riemann_threshold.c