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

[Florian Forster]

 README                  |    6 +++++-
 configure.in            |   35 +++++++++++++++++++++++++++++------
 src/Makefile.am         |    2 ++
 src/collectd-python.pod |    2 +-
 src/collectd.conf.in    |    1 +
 src/common.c            |    3 ++-
 src/ipvs.c              |    4 +++-
 src/oracle.c            |   16 ++++++++++------
 src/python.c            |   32 +++++++++++++++++++-------------
 9 files changed, 72 insertions(+), 29 deletions(-)

New commits:
commit 081695d86026186373a76a4c6b6abacd21b3c3c6
Merge: dba4945 4ecefb9
Author: Florian Forster <octo at collectd.org>
Date:   Sat Jan 28 12:26:51 2012 +0100

    Merge branch 'collectd-5.0'

commit 4ecefb9fb8183eadee48538553615c0425e51f69
Merge: a24bf96 5ebd1df
Author: Florian Forster <octo at collectd.org>
Date:   Sat Jan 28 12:26:41 2012 +0100

    Merge branch 'collectd-4.10' into collectd-5.0

commit a24bf968e72f9a103a354dcc833619a40849cfcd
Merge: 26fbc23 84b91b4
Author: Florian Forster <octo at collectd.org>
Date:   Sat Jan 28 12:03:35 2012 +0100

    Merge remote-tracking branch 'tokkee/sh/collectd-5.0' into collectd-5.0

commit 5ebd1dfbd1d70fc7de6b4a45c3e861202bbdc75b
Author: Florian Forster <octo at collectd.org>
Date:   Thu Jan 26 22:54:34 2012 +0100

    Minor doc fixes for the Python plugin.
    
    Change-Id: I233d0ae4ec035c74811ef33aa119573066c9a3f6

commit 535d74438fc722d0ac1720103a289feb77ceb3ed
Merge: a68d919 6e65bfa
Author: Florian Forster <github at nospam.verplant.org>
Date:   Thu Jan 26 05:00:33 2012 -0800

    Merge pull request #2 from trenkel/collectd-4.10
    
    Even more fun than memory leaks: Memory corruption.

commit 6e65bfa3e52befe75b726d5211ddf3154065588a
Author: Sven Trenkel <collectd at semidefinite.de>
Date:   Thu Jan 26 11:20:28 2012 +0000

    python: Fixed crash bug in case the plugin had more than one configuration block.

commit a68d919b6d2cf26f0626e520d9c1e5869dd1a7ac
Author: Florian Forster <octo at collectd.org>
Date:   Thu Jan 26 11:36:03 2012 +0100

    oracle plugin: Fix use of the OCIErrorGet() function.
    
    Change-Id: I9899b98517fe0c239bffcf7a75681560029aa2ba

commit 52543e770fb2e416365998d02c4b2fc2a53dbb8e
Author: Jonathan Nieder <jrnieder at gmail.com>
Date:   Mon Jan 9 19:01:50 2012 +0100

    common: check_create_dir(): Support symlinks as well.
    
    Previously, the following situation would cause an endless look (as reported
    by Michael Prokop in Debian bug #619123): the (CSV or RRD) datadir is a
    symlink pointing to a non-existent target.
    
    With this patch applied, check_create_dir() fails with "<file> exists but is
    not a directory".
    
    Signed-off-by: Sebastian Harl <sh at tokkee.org>

commit d87bf146cca2c78005cf3c915cbee3cf4a985ad9
Author: Sebastian Harl <sh at tokkee.org>
Date:   Mon Jan 9 11:16:19 2012 +0100

    build system, ipvs plugin: Check for linux/ip_vs.h as well.
    
    Also, try to find ip_vs.h without using KERNEL_CFLAGS at first. The Linux
    kernel headers should not be used directly -- in current kernel versions this
    generates warnings leading to build failures because of -Werror.

commit 84b91b4402505a31da7b7a00cee4e97b1fc11906
Author: Sebastian Harl <sh at tokkee.org>
Date:   Tue Jun 28 09:09:50 2011 +0200

    collectd.conf: Added a (commented out) 'LoadPlugin target_v5upgrade' line.

commit bf2244c62cdb35ae73f21a386dbe542324cf7dee
Author: Sebastian Harl <sh at tokkee.org>
Date:   Sun Jun 5 18:45:02 2011 +0200

    README: Added 'write_redis' plugin.