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

[Florian Forster]

 configure.ac                  |    5 +--
 src/apcups.c                  |   81 ++++++++++++++++++++---------------------
 src/modbus.c                  |   12 +++---
 src/write_kafka.c             |    9 ++++-
 src/write_riemann.c           |    1 -
 src/write_riemann_threshold.c |    2 +
 src/write_riemann_threshold.h |   34 ++++++++++++++++-
 7 files changed, 89 insertions(+), 55 deletions(-)

New commits:
commit 41288c6a9ed050b41ad47184aa1b53668c3588cc
Merge: c442c66 1326af3
Author: Florian Forster <octo at collectd.org>
Date:   Mon Nov 7 08:52:38 2016 +0100

    Merge branch 'collectd-5.6'

commit 1326af38b3ef25c41c994cd76c043202636b3d70
Merge: 4979d8d 68d6aff
Author: Florian Forster <octo at collectd.org>
Date:   Mon Nov 7 08:43:17 2016 +0100

    Merge branch 'collectd-5.5' into collectd-5.6

commit 68d6aff96c029c9a455b7a0146c788af08f9ff22
Merge: f0481f1 0a95eb5
Author: Florian Forster <octo at collectd.org>
Date:   Mon Nov 7 07:03:17 2016 +0100

    Merge remote-tracking branch 'github/pr/2026' into collectd-5.5

commit 0a95eb509bebdd867a65105cdcbc0325d1cccddc
Author: Florian Forster <octo at collectd.org>
Date:   Sat Nov 5 22:32:49 2016 +0100

    apcups plugin: Skip metrics not reported by the UPS.
    
    Fixes: #2025

commit f0481f16ff200ef93c6ea4487a7bc3a59c8f52cb
Author: Florian Forster <octo at collectd.org>
Date:   Sun Nov 6 22:17:02 2016 +0100

    write_kafka plugin: Fix support for librdkafka 0.9.0.
    
    Use rd_kafka_set_logger() only when rd_kafka_conf_set_log_cb() is not
    available:
    
        write_kafka.c: In function 'kafka_handle':
        write_kafka.c:119:6: error: 'rd_kafka_set_logger' is deprecated (declared at /usr/local/include/librdkafka/rdkafka.h:2400) [-Werror=deprecated-declarations]
              rd_kafka_set_logger(ctx->kafka, kafka_log);
              ^
    
    Fixes: #2029

commit f7e26c24f0f57dfc5057644cfd657f617a7bffb6
Merge: 820020d 4c92b22
Author: Florian Forster <octo at collectd.org>
Date:   Sun Nov 6 20:40:36 2016 +0100

    Merge remote-tracking branch 'github/pr/2027' into collectd-5.5

commit 4c92b223198c6b3d6ba0b052f1baea1d33abf31e
Author: Florian Forster <octo at collectd.org>
Date:   Sun Nov 6 10:21:35 2016 +0100

    modbus plugin: Avoid sizeof(struct sockaddr).
    
    The previous version failed on FreeBSD with:
    
        modbus.c: In function 'mb_read_data':
        modbus.c:476:21: error: storage size of 'sockaddr' isn't known
             struct sockaddr sockaddr;
                             ^

commit 820020d0f3770806034c09a8c1500133632f210e
Author: Florian Forster <octo at collectd.org>
Date:   Sun Nov 6 11:10:54 2016 +0100

    src/write_riemann_threshold.h: Various fixes.
    
    * Add license header. Simply copied src/write_riemann_threadhold.c's license.
    * Make header self-contained. "plugin.h" is needed for data_source_t and
      value_list_t.
    * Add names to the parameters and write documentation for the only exported
      function.

commit b133328f9681b159300515b1bd6b32cf0d5d819c
Author: Florian Forster <octo at collectd.org>
Date:   Sun Nov 6 10:34:22 2016 +0100

    write_riemann plugin: Fix order of includes.
    
    The previous version failed on Solaris with:
    
        In file included from ./daemon/collectd.h:31:0,
                         from write_riemann.c:36:
        ./config.h:1619:0: error: "_FILE_OFFSET_BITS" redefined [-Werror]
         #define _FILE_OFFSET_BITS 64
         ^