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

[Florian Forster]

 ChangeLog                   |   54 +++++++++++++++++++++++++++++
 contrib/aix/collectd.spec   |   75 ++++++++++++++++++++++++++++++++++++++++
 contrib/aix/init.d-collectd |   79 +++++++++++++++++++++++++++++++++++++++++++
 src/collectd.conf.in        |    8 +++-
 src/curl_json.c             |   38 ++++++++++++++++++---
 version-gen.sh              |    2 +-
 6 files changed, 248 insertions(+), 8 deletions(-)

New commits:
commit 42ed9d31639cc7dcb3d558c0be08106a21b319d4
Author: Florian Forster <octo at collectd.org>
Date:   Fri Oct 7 17:36:10 2011 +0200

    Bump version to 5.0.1; Update ChangeLog.
    
    Change-Id: I01466d5fb5c0d5c08a48d7c7e7a81239960a2d3c

commit 0cdc4e286b41b6800ab8b371aa391ecbd0fd628a
Merge: 61fba41 9fbe348
Author: Florian Forster <octo at collectd.org>
Date:   Fri Oct 7 17:27:06 2011 +0200

    Merge branch 'collectd-4.10' into collectd-5.0
    
    Conflicts:
    	ChangeLog
    	src/collectd.conf.in
    	src/curl_json.c
    	version-gen.sh
    
    Change-Id: I313c0d3c73d47481baa0a3b38bcdf508f1d4f8d8

commit 9fbe348af96fa4a44fbdc1bd96fa98344f06c760
Author: Florian Forster <octo at collectd.org>
Date:   Fri Oct 7 17:21:57 2011 +0200

    Bump version to 4.10.4; Update ChangeLog.
    
    Change-Id: Ie23cf45f929c52e94e968c7129d24aca7a287dd5

commit f04b1af033df4e2d46ca85280430a7e61ae48b1a
Author: Florian Forster <octo at collectd.org>
Date:   Fri Sep 2 18:41:05 2011 -0400

    collectd.conf.in: Use the "Globals" option for perl and python.
    
    Change-Id: Icaccaab601b91bc829c4da94c5344e0d766735bd

commit fbbe935e9a9d81fb2bda9b764c277226e5ff8117
Author: Aurelien Reynaud <collectd at wattapower.net>
Date:   Thu Oct 14 21:18:47 2010 +0200

    Add RPM .spec file and startup script for AIX
    
    Change-Id: Ic6187891e2014d84f8b2926df1c8b2012f26923f
    Signed-off-by: Aurelien Reynaud <collectd at wattapower.net>
    Signed-off-by: Florian Forster <octo at collectd.org>

commit a647c3cf89a0221e4803887bd3731042edf5498f
Merge: 66bdee8 aadd789
Author: Florian Forster <octo at collectd.org>
Date:   Sat Sep 3 00:48:47 2011 +0200

    Merge "curl_json plugin: Be more clever building the type instance." into collectd-4.10

commit aadd789f6b154f24ea8af09c59a7d98512873806
Author: Florian Forster <octo at collectd.org>
Date:   Sat Aug 27 15:29:42 2011 -0400

    curl_json plugin: Be more clever building the type instance.
    
    When the key of the parent object is empty, don't use it. The previous code led
    to type instances starting with a dash, e.g. "-foo".
    
    Also, be more verbose when unable to resolve types.
    
    Change-Id: Ib5f55efe1acc1e819ac3189b6780a4e998bf9c9f