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

[Florian Forster]

 src/battery.c           |    6 ++++--
 src/daemon/common.c     |   15 ++++++++-------
 src/daemon/configfile.c |   26 ++++++++++++++++++++++++--
 src/dpdkstat.c          |   10 +++++-----
 src/netapp.c            |   10 ++++------
 5 files changed, 45 insertions(+), 22 deletions(-)

New commits:
commit 786a6be461cf58ef2b8c57974cad2a79ba2ee82c
Merge: 7269bf7 bdd27cb
Author: Florian Forster <octo at collectd.org>
Date:   Thu Dec 22 10:57:57 2016 +0100

    Merge branch 'collectd-5.7'

commit bdd27cb013de89b4149393212aef1bf45a221dba
Merge: fadd45e 1afa5e0
Author: Florian Forster <octo at collectd.org>
Date:   Thu Dec 22 10:57:43 2016 +0100

    Merge branch 'collectd-5.6' into collectd-5.7

commit fadd45ecb0eabd5629c3ef5f93d05a1dac25ce73
Author: Florian Forster <octo at collectd.org>
Date:   Thu Dec 22 10:52:44 2016 +0100

    src/daemon/common.c: Change swrite() to return errno if possible.

commit badea203b6a82e68c54e0c55aea2a062eb388d3c
Merge: be6aa28 3ab9322
Author: Florian Forster <ff at octo.it>
Date:   Thu Dec 22 09:13:52 2016 +0100

    Merge pull request #2121 from octo/netapp
    
    netapp plugin: Fix complation problems.

commit 3ab932283678297805292ed4bbbcda36763e4608
Author: Florian Forster <octo at collectd.org>
Date:   Wed Dec 21 15:02:05 2016 +0100

    netapp plugin: Fix compilation problems.
    
    Fixes: #2120

commit be6aa28bfc12c0d35de592a56a3af84c7d8fc9a9
Merge: a89b7f8 38f1d84
Author: Florian Forster <ff at octo.it>
Date:   Mon Dec 19 09:09:05 2016 +0100

    Auto-Merge pull request #2113 from rubenk/dpdk-double-close
    
    Automatically merged due to "Automerge" label

commit a89b7f8968199f200c5c3b1af7097e1f84bff7ae
Merge: 8caac0e ae23661
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date:   Sun Dec 18 13:05:59 2016 +0100

    Merge pull request #2114 from mfournier/dpdkstat-formatstring
    
    dpdkstat: use portable format strings

commit ae236613e87114ce4e3b027f37d414826fda7f68
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date:   Sun Dec 18 11:17:59 2016 +0100

    dpdkstat: use portable format strings

commit 8caac0e434896a2e84a68e5fc6441740395042d3
Merge: e60fc45 55299db
Author: Florian Forster <ff at octo.it>
Date:   Sat Dec 17 20:04:15 2016 +0100

    Merge pull request #2112 from rubenk/battery-plugin-nul-terminate-buffer
    
    Battery plugin: nul-terminate buffer

commit 38f1d841840096c00a3d0b57bc2c86b6a256f303
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date:   Sat Dec 17 18:50:58 2016 +0100

    dpdkstat: don't close already closed fd on failure
    
    CID #158525

commit 55299db6f5fe4ae0e784c77ec16c66c71a18f2e8
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date:   Sat Dec 17 18:39:39 2016 +0100

    battery plugin: null-terminate buffer
    
    We call strstripnewline on it, which expects a null-terminated string.
    
    CID #158524

commit 1afa5e081f364890b7c855b728f26d3923f1cbb7
Merge: bb1d857 f825571
Author: Florian Forster <ff at octo.it>
Date:   Fri Dec 16 14:39:07 2016 +0100

    Auto-Merge pull request #2099 from tokkee/sh/booleans
    
    Automatically merged due to "Automerge" label

commit f825571e25f8fb0140f28fb12cad112f58fd86b1
Author: Sebastian Harl <sh at tokkee.org>
Date:   Sun Dec 11 12:06:58 2016 +0100

    configfile: Reintroduce support for boolean string config values.
    
    For the network plugin, this was changed in ac73c75aed7 (which landed in 5.6)
    which was a backward incompatible change breaking user configuration. Adding
    support back in a central location ensures a more consistent behavior across
    plugins. At the same time, we issue a warning message that this behavior is
    deprecated.
    
    GH #2083, #2098