[collectd-changes] collectd, the system statistics collection daemon: Changes to 'master'

[Florian Forster]

 src/collectd.conf.pod |    2 +-
 src/drbd.c            |    2 +-
 src/write_kafka.c     |    2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit c8b2244fdb1e7be39d0a3c2f2e16145f4dcda1a3
Merge: 1d38f57 0674cf7
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date:   Tue Aug 12 17:54:51 2014 +0200

    Merge pull request #700 from timl/drbd_warning_fix
    
    drbd plugin: Make the warning message more readable when /proc/drbd is m...

commit 0674cf7aa3679a5030e2cd1400ad533458d1f308
Author: Tim Laszlo <Tim.Laszlo at magnetar.com>
Date:   Tue Aug 12 08:33:09 2014 -0500

    drbd plugin: Make the warning message more readable when /proc/drbd is missing

commit 1d38f57366c39bf5a8e72b4302209f24e221f66c
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date:   Mon Aug 11 13:07:52 2014 +0200

    collectd.conf(5): fix typo

commit f505691270f2317291c372fd5f004a4ffbce9f9a
Merge: 8458bc1 1ad8527
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date:   Mon Aug 11 10:54:58 2014 +0200

    Merge pull request #694 from mfournier/kafka_missing_ifdef
    
    write_kafka: avoid unused function build error

commit 1ad8527f22f82b8114513172e069e6e9d4dd7830
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date:   Wed Aug 6 16:28:07 2014 +0200

    write_kafka: avoid unused function build error