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

[Florian Forster]

 contrib/collection3/bin/graph.cgi                  |    9 ++-
 contrib/collection3/bin/index.cgi                  |   18 ++-
 contrib/collection3/etc/collection.conf            |    8 ++
 contrib/collection3/lib/Collectd/Graph/Common.pm   |  113 ++++++++++++++++++++
 .../collection3/lib/Collectd/Graph/Type/Load.pm    |    2 -
 src/collectd-exec.pod                              |    6 +-
 src/collectd.conf.pod                              |    4 +-
 src/collectd.pod                                   |    2 +
 src/common.h                                       |   10 +-
 src/memcached.c                                    |   27 ++++--
 10 files changed, 175 insertions(+), 24 deletions(-)

New commits:
commit 148e8732e45435a051df1c3673cad0d5dc77492f
Merge: 6a968db27aab6d8c4cfe4f6e4c5bf3183eb84794 66e0fe82631c8a8e44ffcad8ffd378fab83bc83f
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Wed Aug 20 09:21:37 2008 +0200

    Merge branch 'collectd-4.4'
    
    Conflicts:
    
    	src/collectd.conf.pod

commit 66e0fe82631c8a8e44ffcad8ffd378fab83bc83f
Merge: 6d6ab00ae5491ce86a8ff0ee4ec834a0b5794169 e7929dac268957cbbd9082717759c3917ac1b51e
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Wed Aug 20 09:20:56 2008 +0200

    Merge branch 'collectd-4.3' into collectd-4.4

commit e7929dac268957cbbd9082717759c3917ac1b51e
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Tue Aug 19 21:48:45 2008 +0200

    memcached plugin: Fix a possible file descriptor leak.
    
    Not sure if this fixes the reported bug, but it might.. Feedback would be
    welcome.
    
    References: #26

commit 6d6ab00ae5491ce86a8ff0ee4ec834a0b5794169
Author: Florian Forster <octo at noris.net>
Date:   Tue Aug 19 17:18:57 2008 +0200

    contrib/collection3: Added graph description for `ps_rss'.

commit 2bbd3e134282628fb609abeee34f0884c1759e6a
Author: Florian Forster <octo at noris.net>
Date:   Tue Aug 19 16:58:43 2008 +0200

    contrib/collection3: Added the ability to `flush' data sets.
    
    Both, bin/index.cgi and bin/graph.cgi can now send a FLUSH command to
    the daemon via the Collectd::Unixsock module. For this to work you will
    have to add the path to the UNIX socket of the `unixsock' plugin to the
    configuration file `collection.conf'.
    
    The configuration looks like this:
      UnixSockAddr "/var/run/collectd-unixsock"

commit da111db2cdcee585415f1508dc412833c9f74ccc
Author: Florian Forster <octo at noris.net>
Date:   Tue Aug 19 16:54:10 2008 +0200

    contrib/collection3: Remove an annoying debug message.

commit 08f7ba5a19b0233ba2a7b6b4cd1b089cde36587f
Author: Peter Holik <peter at holik.at>
Date:   Tue Aug 19 11:08:53 2008 +0200

    collectd.conf(5): Added documentation for the ipmi plugin.
    
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>

commit a824bd24b2cc4c38b328f27364a26f753f5b70b0
Author: Sebastian Harl <sh at tokkee.org>
Date:   Mon Aug 18 09:30:03 2008 +0200

    src/common.h: Make sfree() usable like a function.
    
    By putting the code into a "do { } while (0)" loop it is treated like a single
    statement and does not break "if () sfree()" like constructs.
    
    Signed-off-by: Sebastian Harl <sh at tokkee.org>
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>

commit 75d17e09a06d7d08646591999cfae5c21d56be4a
Author: Sebastian Harl <sh at tokkee.org>
Date:   Sat Aug 16 19:35:58 2008 +0200

    collectd(1), collectd{-exec,.conf}(5): Fixed some minor POD errors.
    
    Signed-off-by: Sebastian Harl <sh at tokkee.org>
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>