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

[Florian Forster]

 ChangeLog             |   22 ++++++++++++++++++++++
 README                |   10 +++++++++-
 configure.in          |    8 ++++----
 src/collectd-snmp.pod |    2 +-
 src/collectd.conf.in  |   13 +++++++++++++
 src/gmond.c           |    4 ++--
 version-gen.sh        |    2 +-
 7 files changed, 52 insertions(+), 9 deletions(-)

New commits:
commit b3facabd3ed3fa40c81a8122b78daffbbbdf34a6
Merge: 3dd0749cee604a91aa7204d816fc4974fbcbde36 071ba511ddd1245b1f56c28f1801ca37e9adfaa1
Author: Florian Forster <octo at noris.net>
Date:   Wed Oct 21 10:21:10 2009 +0200

    Merge branch 'collectd-4.8'

commit 071ba511ddd1245b1f56c28f1801ca37e9adfaa1
Merge: db37d40a9325544ca28ec33d80564d21bc18b34f b0b35c33b67d9fe37538f38aaa7db7d34d4df002
Author: Florian Forster <octo at noris.net>
Date:   Wed Oct 21 10:20:27 2009 +0200

    Merge branch 'collectd-4.7' into collectd-4.8

commit db37d40a9325544ca28ec33d80564d21bc18b34f
Author: Sebastian Harl <sh at tokkee.org>
Date:   Tue Oct 13 19:39:37 2009 +0200

    gmond plugin: Fixed a typo.
    
    For some reason, the value_t members "derive" and "absolute" had been spelled
    in all capital letters, obviously resulting in a build error.

commit e728e2bb0c969ff1a69b19bb0addf1adc9bc6f87
Author: Sebastian Harl <sh at tokkee.org>
Date:   Tue Oct 13 19:34:20 2009 +0200

    collectd.conf: Added the "madwifi" and "match_empty_counter" plugins.

commit 5c8b7a1e1e9d729f4fa2955ad1aabb02523fff41
Author: Sebastian Harl <sh at tokkee.org>
Date:   Sun Oct 11 18:43:00 2009 +0200

    README: Added missing prerequisites.

commit b0b35c33b67d9fe37538f38aaa7db7d34d4df002
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Thu Oct 8 19:00:21 2009 +0200

    configure.in: Don't use “find -L”.
    
    Apparently the “-L” is a (new) GNU extension. :/

commit baf9830414d44eb5af677e1a4aa9aa48468687c2
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Thu Oct 8 18:57:04 2009 +0200

    collectd-snmp(5): Fix a typo.
    
    Thanks to mspo.

commit 0a09163c87616821f2e875a86a3d47e03431651c
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sun Oct 4 09:45:00 2009 +0200

    ChangeLog: Fix a stupid typo.

commit e4d28459ac49f8386626274442f3678301287d94
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sun Oct 4 09:06:18 2009 +0200

    Bumped version to 4.8.1; Updated ChangeLog.

commit 08597c4e80e8dd5d0a04c823b055ef230194a2b6
Merge: ec6204a39b67229bfb05b763d1ceea135150880d 44a080a9d7cecc63b7bf1842cdaf7ce357e08c46
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sun Oct 4 09:02:31 2009 +0200

    Merge branch 'collectd-4.7' into collectd-4.8
    
    Conflicts:
    	ChangeLog
    	version-gen.sh

commit 44a080a9d7cecc63b7bf1842cdaf7ce357e08c46
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sat Oct 3 17:44:24 2009 +0200

    Bumped version to 4.7.4; Updated ChangeLog.