Code

Merge branch 'collectd-5.6' into collectd-5.7
authorFlorian Forster <octo@collectd.org>
Thu, 8 Dec 2016 14:27:03 +0000 (15:27 +0100)
committerFlorian Forster <octo@collectd.org>
Thu, 8 Dec 2016 14:27:03 +0000 (15:27 +0100)
commit3fb6fe5776c14f41879249f4147c0b8924b39cc1
tree6804fea55a73040479e9ac312469bb97336bee91
parentb8b1e35f503af693b8c53ddd32ffd41981a82dd5
parentbb1d857383b85dbc2c37098391d53e2b9261c830
Merge branch 'collectd-5.6' into collectd-5.7
src/collectd.conf.pod
src/smart.c
src/write_kafka.c