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

[Florian Forster]

 ChangeLog              |   13 +++++++++
 configure.in           |   63 ++++++++++++++++++++++++-----------------------
 contrib/collection.cgi |   65 ++++++++++++++++++++++++++++++++++++++++++++-----
 src/apcups.c           |   16 ++++++------
 src/collectd.c         |    2 -
 src/common.c           |    4 +--
 src/netlink.c          |   17 ++++++------
 7 files changed, 123 insertions(+), 57 deletions(-)

New commits:
commit 27f6db4769cac5727888c327dbbf1b88da4f3ca6
Merge: 549e1f3857209db73e5e254be7aa1782c5face0c 8c25e77d295d6116ad957a3ed774c0f95d3974f8
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Tue Sep 11 11:50:51 2007 +0200

    Merge branch 'collectd-4.0' into collectd-4.1

commit 8c25e77d295d6116ad957a3ed774c0f95d3974f8
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Tue Sep 11 11:50:43 2007 +0200

    ChangeLog: Documented the fix in the apcups plugin.

commit 549e1f3857209db73e5e254be7aa1782c5face0c
Merge: d3648402a2a770bea639ae65c2ccd42196c7a490 e9e15292f5e08e5e7e5f795ec5df2e3680042d88
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Tue Sep 11 11:46:07 2007 +0200

    Merge branch 'uni/collectd-4.1' into collectd-4.1

commit 3d6143a0148f877146aad330cec8d5578b774816
Merge: f0c44c295d16ab49ba6e7e36d8ae9aae78e460f4 59d8ed329bdad86d73152c00e9e582f1086cef8b
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Tue Sep 11 11:45:50 2007 +0200

    Merge branch 'uni/collectd-4.0' into collectd-4.0

commit f0c44c295d16ab49ba6e7e36d8ae9aae78e460f4
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Tue Sep 11 11:14:56 2007 +0200

    apcups plugin: Fix the types used in the plugin.
    
    They still had an `apcups_' prefix which isn't legal anymore.

commit feaebecc0da2199b4dbbc2d8f0aa2c712b91e835
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Tue Sep 11 11:11:25 2007 +0200

    collectd: Make `mkdir' error messages more identifiable.

commit d3648402a2a770bea639ae65c2ccd42196c7a490
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Tue Sep 11 11:09:32 2007 +0200

    netlink plugin: Fix an error-message.

commit e9e15292f5e08e5e7e5f795ec5df2e3680042d88
Author: Florian Forster <sifnfors at faui02l.informatik.uni-erlangen.de>
Date:   Mon Sep 10 10:49:51 2007 +0200

    ChangeLog: Documented the changes since 4.1.0.

commit c8ec3924c92ad3ca15229e8e923eaece64221337
Merge: 8a35017c70b0fc1a3531a0b630071dedbbaa9372 59d8ed329bdad86d73152c00e9e582f1086cef8b
Author: Florian Forster <sifnfors at faui02l.informatik.uni-erlangen.de>
Date:   Mon Sep 10 10:43:49 2007 +0200

    Merge branch 'collectd-4.0' into collectd-4.1
    
    Conflicts:
    
    	ChangeLog

commit 59d8ed329bdad86d73152c00e9e582f1086cef8b
Author: Florian Forster <sifnfors at faui02l.informatik.uni-erlangen.de>
Date:   Mon Sep 10 10:43:19 2007 +0200

    ChangeLog: Fix a merge bug.

commit b0378fa288fd429d66d5d6854e63a371831013f0
Author: Florian Forster <sifnfors at faui02l.informatik.uni-erlangen.de>
Date:   Mon Sep 10 10:41:39 2007 +0200

    ChangeLog: Added a note about the improved `sstrerror' function.

commit 9487ec7f83bf54a3d84a85f94fdc0f6715e1e517
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Wed Sep 5 09:30:01 2007 +0200

    contrib/collection.cgi: Fix a bug in the `meta_graph_generic_stack' function.
    
    Also add a meta-graph-handler for if_[rt]x_errors.

commit 8a35017c70b0fc1a3531a0b630071dedbbaa9372
Merge: 57825ea7c0e93f8d1312c5448232c9ab5d2b17d6 4288440742e51d2e2d05243cf2d23b7c9e1e6fd2
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Tue Sep 4 23:46:12 2007 +0200

    Merge branch 'pull/collectd-4.1' into collectd-4.1

commit 57825ea7c0e93f8d1312c5448232c9ab5d2b17d6
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Tue Sep 4 23:44:50 2007 +0200

    build system: Include <adm/types.h> when checking for `libnetlink.h'.

commit 4288440742e51d2e2d05243cf2d23b7c9e1e6fd2
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Tue Sep 4 10:32:13 2007 +0200

    netlink plugin: Use the defines to determine where the `libnetlink.h' is.

commit 48bc4be818e77c8c7f89f33c7e74269530ef14b4
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Tue Sep 4 10:31:38 2007 +0200

    build system: Check for libnetlink.h in more than one directory.
    
    And some minor cleanups..

commit 1398c68c26ecf0add2d5378840f013a5213c6e0f
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Tue Sep 4 10:14:22 2007 +0200

    build system: Some cosmetic fixes for the libupsclient.