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

[Florian Forster]

 src/Makefile.am         |    2 +-
 src/daemon/collectd.c   |    3 ++-
 src/daemon/configfile.c |   10 +++++++---
 src/df.c                |   15 ++++++++-------
 src/modbus.c            |    2 +-
 src/snmp.c              |    1 +
 src/table.c             |    3 ++-
 src/tail.c              |    2 +-
 src/threshold.c         |    4 ----
 src/utils_db_query.c    |    3 ++-
 src/virt.c              |    6 ++++++
 11 files changed, 31 insertions(+), 20 deletions(-)

New commits:
commit 1b15b227585497f72ab0e42d96d79c0313323bd4
Merge: f995a5d 0003c4d
Author: Florian Forster <octo at collectd.org>
Date:   Thu Jun 18 16:55:53 2015 +0200

    Merge branch 'collectd-5.5'

commit 0003c4d3c184f0f437499d6073cd023dc7b659c2
Merge: 2493484 9c3ed64
Author: Florian Forster <octo at collectd.org>
Date:   Thu Jun 18 16:52:09 2015 +0200

    Merge branch 'collectd-5.4' into collectd-5.5

commit 2493484aac8d45b5a5abdb80f4db8c51db77bf6e
Author: Florian Forster <octo at collectd.org>
Date:   Thu Jun 18 16:45:23 2015 +0200

    modbus plugin: Make sure variable is initialized.
    
    This was introduced by the merge
    (09c6a320f3cb36b5dbb2c2ce43858f33be7acf9b).

commit 9c3ed6462c15fd1cb664cd0ec2a5efb289aa1af6
Author: Florian Forster <octo at collectd.org>
Date:   Thu Jun 18 16:09:10 2015 +0200

    stats plugin: Link with libm (-lm).
    
    Fixes a bug reported by @Tenzer:
    
        symbol lookup error: /usr/lib/collectd/statsd.so: undefined symbol: log

commit 88a41ccbc4b6cb737a82e124a5b1731eeb3dbeb6
Author: Florian Forster <octo at collectd.org>
Date:   Thu Jun 18 15:31:11 2015 +0200

    tail plugin: Make sure variable is initialized.
    
    This was introduced by the merge
    (09c6a320f3cb36b5dbb2c2ce43858f33be7acf9b).

commit 4b396ba5395402488a8fddacd361836a6b5afdd5
Author: Florian Forster <octo at collectd.org>
Date:   Thu Jun 18 15:27:54 2015 +0200

    Fix "Undefined allocation of 0 bytes (CERT MEM04-C; CWE-131)" warnings.

commit 23ef1eef2328540d9742b7ac7f3cf192143423c1
Author: Florian Forster <octo at collectd.org>
Date:   Thu Jun 18 14:45:02 2015 +0200

    threshold plugin: Fix "Dead increment" warnings.

commit 7f4143effc63ffbfa7593280822e4ca2cd7e0c09
Author: Florian Forster <octo at collectd.org>
Date:   Thu Jun 18 13:36:02 2015 +0200

    Fix "Argument with 'nonnull' attribute passed null" warnings.