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

Tue Jun 16 22:46:30 CEST 2015

 README                       |    2 +-
 configure.ac                 |   38 ++++++++-
 contrib/redhat/collectd.spec |    5 +-
 src/collectd.conf.pod        |    2 +-
 src/daemon/configfile.c      |   20 ++---
 src/disk.c                   |  179 ++++++++++++++----------------------------
 src/liboconfig/Makefile.am   |    2 +-
 src/mysql.c                  |    2 +-
 src/network.c                |  134 +++++++------------------------
 src/utils_rrdcreate.c        |   28 +++++--
 src/write_redis.c            |    3 +
 11 files changed, 162 insertions(+), 253 deletions(-)

New commits:
commit fbcd49e749c383728f81174280f976ae0d2be2c7
Merge: ac73c75 3812f29
Author: Florian Forster <octo at collectd.org>
Date:   Tue Jun 16 22:46:25 2015 +0200

    Merge branch 'collectd-5.5'

commit 3812f29af0b4ae25d1e0114ee0afc4a83880e913
Merge: b2e0cf2 84f5f59
Author: Florian Forster <octo at collectd.org>
Date:   Tue Jun 16 22:46:06 2015 +0200

    Merge branch 'collectd-5.4' into collectd-5.5

commit 84f5f5923d8109366b2c3caf66ad7c2d89be38bd
Author: Manuel Luis SanmartÃn Rozada <manuel.luis at gmail.com>
Date:   Wed May 20 17:10:41 2015 +0200

    In rrd synchronous file creation use lock_file
    to prevent the creation of the same file at the same time multiple times
    and obtain a corrupt rrd file.

commit ac73c75aed7c134c6db377a5a306d51e20356fbb
Author: Florian Forster <octo at collectd.org>
Date:   Tue Jun 16 20:59:14 2015 +0200

    network plugin: Simplify config handling.
    
    Remove network_config_set_{boolean,string} and replace them with
    cf_util_get_{boolean,string}. The other, more specialized, config handling
    functions were also simplified.

commit 0944585208ec2427fc434881e99228e9f870eaef
Author: Manuel Luis SanmartÃn Rozada <manuel.luis at gmail.com>
Date:   Wed May 20 22:06:18 2015 +0200

    Allow empty Plugin blocks.

commit b2e0cf2ea4b094a96e8096c31897bdd98e798282
Author: Manuel Luis SanmartÃn Rozada <manuel.luis at gmail.com>
Date:   Wed May 20 22:06:18 2015 +0200

    Allow empty Plugin blocks.

commit 8d787a83083e1bc705848eebb692e7c899870e83
Author: Marek Becka <marek.becka at superhosting.cz>
Date:   Tue Jun 16 12:38:37 2015 -0400

    use counter type for Innodb_buffer_pool_pages_flushed

commit c6a59a5a3f0eb7a0e81beeb948d8a31b17462efe
Merge: f64a8b0 56d85ff
Author: Florian Forster <octo at collectd.org>
Date:   Tue Jun 16 20:38:38 2015 +0200

    Merge remote-tracking branch 'github/pr/1085'

commit 65ca69925947aad1307e6ab2bff8501d7c49b249
Author: Dagobert Michelsen <dam at opencsw.org>
Date:   Mon Jun 15 18:49:46 2015 +0200

    Fix 64 bit check issue, running the preprocessor does not honour CFLAGS which holds the relevant -m64

commit 56d85ff7bc14d98da63dc443e25085bc5544a1ea
Author: Marek Becka <marek.becka at superhosting.cz>
Date:   Tue Jun 16 12:38:37 2015 -0400

    use counter type for Innodb_buffer_pool_pages_flushed

commit f64a8b0906df8f97fbe91f15a919c76b83f93ba9
Merge: d143bc6 f664b94
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date:   Tue Jun 16 09:18:25 2015 +0200

    Merge branch 'collectd-5.5'

commit df3e412ed81290689b3af9b2e83c19a245d0e978
Author: Kelly Thomas Kline <kellytk at users.noreply.github.com>
Date:   Mon Jun 15 14:05:51 2015 -0700

    Corrected text in README

commit f664b944f774e4d1e5d5c562eaf0bb207c6a7edf
Merge: 33b6aff ea7a1f4
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date:   Mon Jun 15 21:18:04 2015 +0200

    Merge branch 'collectd-5.4' into collectd-5.5
    
    Conflicts:
    	src/write_redis.c

commit 33b6aff71496fcab04a307d8e9c02259c58bfec1
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date:   Mon Jun 15 16:09:50 2015 +0200

    Revert "contrib/redhat/collectd.spec: added bison and flex"
    
    This reverts commit 38203b1c8d8a8e5e567d7f6783dd8b88a2487070.
    
    A misunderstanding about which tarball to use with the RPM specfile led
    us here. See #1079 for the whole conversation.

commit 550ff5da10244d6e4e97cb0719e133007012d08d
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date:   Mon Jun 15 11:01:42 2015 +0200

    configure: turbostat: check for MSR_PKG_C10_RESIDENCY symbol
    
    Older versions of `asm/msr-index.h` don't have all the symbol needed to
    build the turbostat plugin. Checking for MSR_PKG_C10_RESIDENCY seems to
    guarantee we have a recent enough `asm/msr-index.h`.
    
    Fixes #1075

commit ea7a1f41eb1d32fa881658db871b4006a17cb980
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date:   Mon Jun 15 08:50:04 2015 +0200

    collectd.conf.pod: update libyajl URL
    
    Fixes #1081
    
    Thanks to @msalmonse for pointing this out!

commit b8a525a80874e431e1a076e1b45ab3d221a8a702
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date:   Fri Mar 6 16:11:18 2015 +0100

    Fix a libtool warning
    
    libtool: warning: '-version-info/-version-number' is ignored for
    convenience libraries

commit 85444aff6af9e48eec21ccf32d19eb0296567d5b
Merge: 38203b1 8c103cf
Author: Florian Forster <octo at collectd.org>
Date:   Thu Jun 11 17:35:13 2015 +0100

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

commit 7c04f775898bef164b834e036f1698f752b12f74
Author: Florian Forster <octo at collectd.org>
Date:   Thu Jun 11 16:48:55 2015 +0100

    write_redis plugin: Check the return value of format_values().

commit 1fc8ef7784730f6da37b3648fdeb4772d16cb4a9
Author: brianpkelly (no email) <collectd at verplant.org>
Date:   Thu Jun 11 09:52:22 2015 -0500

    write_redis: Increase parsability by using format_values from common.h

commit 5c416628a579131d57e75f217bfb7845a66fe62f
Author: brianpkelly (no email) <collectd at verplant.org>
Date:   Tue Jun 9 13:52:54 2015 -0500

    write_redis: Increase parsability of multi-valued keys by insterting delimiting characters

commit a621ced2e9c74c596f7b24d7e49c6e828f59fd39
Author: Florian Forster <octo at collectd.org>
Date:   Thu Jun 11 16:32:07 2015 +0100

    configure.ac: Move all checks for "struct ip6_ext" into one place.
    
    Fixes: #348

commit 619cdcd8fb748ee06056fa4ef63dac7f24c7db1f
Author: Dagobert Michelsen <dam at opencsw.org>
Date:   Thu Jun 11 11:26:23 2015 +0200

    Automatically add -DSOLARIS2=8 if required for ip6_ext
    
    Fixes: #348

commit 8c103cf17c65f4381db0d9f32cc4c3f4b4dc0875
Author: Robert Viduya <robert at oit.gatech.edu>
Date:   Wed Jun 3 08:34:37 2015 -0400

    disk plugin: Coding style changes.
    
    I also reorganized the code to try to keep the CFReleases and
    IOObjectReleases a little more manageable.
    
    Signed-off-by: Florian Forster <octo at collectd.org>

commit 79d6f5003215a462a17916dbddd45435ce740e5a
Author: Robert Viduya <robert at oit.gatech.edu>
Date:   Wed Jun 3 08:34:37 2015 -0400

    disk plugin: Fix compatibility for Mac OS X 10.10.
    
    Hereâ€™s a fixed version of the disk plugin that makes it work under Mac
    OSX 10.10, and hopefully previous releases. The original version was
    looking for the disk name in one dictionary, but it was actually in
    another. I suspect at some point, Apple moved the disk name property,
    but I donâ€™t have any previous releases to check.
    
    I changed the code to look for the disk name in both dictionaries, so
    hopefully itâ€™s backward compatible.
    
    Signed-off-by: Florian Forster <octo at collectd.org>