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

[Florian Forster]

 src/collectd-perl.pod |    2 +-
 src/collectd.conf.pod |    8 ++++++--
 src/logfile.c         |    2 +-
 src/nginx.c           |    4 ++--
 src/utils_avltree.c   |    7 +++----
 src/utils_avltree.h   |    4 ++--
 src/utils_llist.c     |    4 ++++
 7 files changed, 19 insertions(+), 12 deletions(-)

New commits:
commit 4a5e97d6e317ee050b0a942e50159473a7d144dc
Merge: 8798c7ec333eb16410161d99487ab0bee4d9adc3 3b915093d8cbc7738b2de59f6ebc38f195131002
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Thu Dec 13 08:16:16 2007 +0100

    Merge branch 'collectd-4.2'
    
    Conflicts:
    
    	src/utils_llist.c

commit 8798c7ec333eb16410161d99487ab0bee4d9adc3
Author: Luke Heberling <collectd at c-ware.com>
Date:   Thu Dec 13 08:15:38 2007 +0100

    src/utils_avltree.[ch]: Change avl_insert to return >0 if the key is already in the tree.
    
    I'd like to be able to tell when avl_insert fails because of a duplicate key as
    opposed to when it fails due to out of memory or other condition.
    
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>

commit 3b915093d8cbc7738b2de59f6ebc38f195131002
Author: Luke Heberling <collectd at c-ware.com>
Date:   Thu Dec 13 08:09:16 2007 +0100

    src/utils_avltree.c: Fix avl_get to work as documented.
    
    The documentation in the header file for avl_get states that value may be null,
    but the code in the source file asserts otherwise. This patch changes the code
    to reflect the documentation.
    
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>

commit 65cbd6ca1da0d802ac39b460dcb8ae0af3762c13
Author: Luke Heberling <collectd at c-ware.com>
Date:   Thu Dec 13 08:06:26 2007 +0100

    rc/utils_llist.c: Fix a bug in llist_prepend.
    
    Copy the element to the tail if it's the first element.

commit eb0ca66c4f3d66c58105635876d958a43499f5e3
Author: Luke Heberling <collectd at c-ware.com>
Date:   Thu Dec 13 08:03:03 2007 +0100

    collectd.conf(5): Added a note about plugin loading order.

commit bee56140f39a62b454ea0eab0c0f9af48aa29e63
Author: Luke Heberling <collectd at c-ware.com>
Date:   Thu Dec 13 08:01:16 2007 +0100

    logfile plugin: fix the `Timestamp' configuration option.

commit 21d3ac6f9cfee60d261cda30b6ec71b3c496f8b7
Author: Saulius Grigaliunas <saulius.grigaliunas at gmail.com>
Date:   Thu Dec 13 07:58:51 2007 +0100

    nginx plugin: Use strcmp rather than strcpy to compare strings.
    
    I believe I found a typo in nginx.c which prevents collectd with nginx plugin
    from working. Collectd segfaults at startup. Here is a tiny patch to correct
    the issue. When applied, everything works as expected.
    
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>

commit 77dfe1e6d120e139933112966803d67c9a1ff8e5
Author: Sebastian Harl <sh at tokkee.org>
Date:   Mon Nov 12 16:38:13 2007 +0100

    collectd-perl(5): Fixed a typo.
    
    Signed-off-by: Sebastian Harl <sh at tokkee.org>
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>