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

[Florian Forster]

 .gitignore            |    1 
 TODO                  |   10 ++--
 src/Makefile.am       |    5 +-
 src/collectd-exec.pod |  112 ++++++++++++++++++++++++++++++++++++++++++++------
 src/collectd-perl.pod |    6 +-
 src/collectd-snmp.pod |    2 
 src/collectd.c        |    2 
 src/collectd.conf.pod |    6 +-
 src/collectd.pod      |    1 
 src/configfile.c      |   31 ++++++++++++-
 src/types.db.pod      |   51 ++++++++++++++++++++++
 src/types_list.c      |    7 ---
 src/types_list.h      |    2 
 13 files changed, 201 insertions(+), 35 deletions(-)

New commits:
commit 06d0305ee967a12cb541dee87f79c31cac9d1b10
Merge: b62e76ba5220c5279c29d970a65fa5a74dc1f145 d86c4d2097fdb259915ee8f80b1ed59be6e0d994
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Mon Jan 21 18:30:48 2008 +0100

    Merge branch 'pull/master'

commit b62e76ba5220c5279c29d970a65fa5a74dc1f145
Merge: 7c42c7b1c428f5cc5f30af1122488497b3b31b96 ff4ebc0fd3c93a39a18edc629d61787f60a92706
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Mon Jan 21 18:30:43 2008 +0100

    Merge branch 'collectd-4.2'

commit ff4ebc0fd3c93a39a18edc629d61787f60a92706
Merge: 0b88f6888705e92ce4472435a464730cf2ce2d5a f71467d9c2097ddd9eb772a4fdb985663168ec71
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Mon Jan 21 18:30:26 2008 +0100

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

commit 7c42c7b1c428f5cc5f30af1122488497b3b31b96
Merge: d65dbf9b6ed81d3310c3dfd6c4e38557d1cd61ab aa05b885e05fefe8439244601841f464619284c5
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Mon Jan 21 18:29:34 2008 +0100

    Merge branch 'ff/manpage'

commit d65dbf9b6ed81d3310c3dfd6c4e38557d1cd61ab
Author: Sebastian Harl <sh at tokkee.org>
Date:   Sun Jan 20 22:17:23 2008 +0100

    types.db(5): Added a manpage documenting the format of the TypesDB file.
    
    Appropriate pointers have been added to other manpages where appropriate.
    
    Signed-off-by: Sebastian Harl <sh at tokkee.org>
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>

commit c88e459eb3823b766fc3a9ed37f25bc1f630146c
Merge: b6813a972bf80e6bf4725a63be7270d5beb834e5 0b88f6888705e92ce4472435a464730cf2ce2d5a
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Mon Jan 21 18:28:51 2008 +0100

    Merge branch 'collectd-4.2'

commit 0b88f6888705e92ce4472435a464730cf2ce2d5a
Merge: fe9c4eef067aa252dbbd42a364baafc373421893 57d32cdea9ed71a34cfdf62e8b0050749486319e
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Mon Jan 21 18:28:27 2008 +0100

    Merge branch 'collectd-4.1' into collectd-4.2

commit 57d32cdea9ed71a34cfdf62e8b0050749486319e
Author: Sebastian Harl <sh at tokkee.org>
Date:   Fri Jan 18 12:29:19 2008 +0100

    collectd-exec(5): Improved description of the value-list identifier.
    
    A short note about valid values for the plugin and type names and the
    respective instance names as well as a pointer to types.db has been added.
    
    Signed-off-by: Sebastian Harl <sh at tokkee.org>
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>

commit b6813a972bf80e6bf4725a63be7270d5beb834e5
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Mon Jan 21 18:27:16 2008 +0100

    TODO: Added some notes on what needs to be done before 4.3
    
    It's only what I had in mind right now and not a complete list.

commit aa05b885e05fefe8439244601841f464619284c5
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Mon Jan 21 18:16:55 2008 +0100

    collectd-exec(5): Documented the changes due to notifications and the Nagios plugin support.

commit 0ff9018b4925232bf469a6d8d19cade0ee6cff6c
Author: Sebastian Harl <sh at tokkee.org>
Date:   Sun Jan 20 22:14:23 2008 +0100

    Added support for more than one TypesDB file.
    
    The "TypesDB" config option now accepts more than one filename. Each file will
    be read in the specified order. If no filename has been given, the default
    file will _not_ be read (I doubt this is a useful feature but it's imho the
    most reasonable behavior).
    
    This may, for example, be used to specify an additional file containing custom
    data-set definitions. See the thread "Thought about exec and types.db" on the
    mailing-list ([1]).
    
    [1] http://mailman.verplant.org/pipermail/collectd/2008-January/001450.html
    
    Signed-off-by: Sebastian Harl <sh at tokkee.org>
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>