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

[Florian Forster]

 ChangeLog                    |   10 ++
 configure.in                 |    2 
 contrib/PerlLib/Collectd.pm  |    2 
 contrib/fedora/collectd.spec |  186 ++++++++++++++++++++++++++++++++-----------
 src/collectd.conf.in         |    1 
 src/sensors.c                |   16 +++
 src/syslog.c                 |   14 +--
 7 files changed, 173 insertions(+), 58 deletions(-)

New commits:
commit 1ec7adf09a1df8b4b38330869c95a12eca15017a
Merge: 785feb9d2544aff7f561fbda30aa762eec9e07bc 3ab19962c1552df25fbe55a2afc0842ddfd21c08
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Fri Aug 3 10:56:17 2007 +0200

    Merge branch 'pull/master'

commit 785feb9d2544aff7f561fbda30aa762eec9e07bc
Merge: 8bf455b7a37d96404ba24fe1418a925fb9aa740a 6ba08d7abcd09f2a384d5dd5582e1b2ce391cf02
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Fri Aug 3 10:55:03 2007 +0200

    Merge branch 'collectd-4.0'
    
    Conflicts:
    
    	ChangeLog

commit 6ba08d7abcd09f2a384d5dd5582e1b2ce391cf02
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Fri Aug 3 10:09:47 2007 +0200

    Bumped version to 4.0.6; Updated ChangeLog.

commit 69faa36263df439329148ed30b877b41ec6a6d93
Merge: 8982229ed8d750dd7577e5ec954c0b4018666081 8160b214d70d04bfde66b788ea1a25ec99044cde
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Tue Jul 31 09:29:46 2007 +0200

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

commit 8982229ed8d750dd7577e5ec954c0b4018666081
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Tue Jul 31 09:29:19 2007 +0200

    src/collectd.conf.in: Added the `SocketFile' option for the email plugin.

commit 01d046d682a69287d41692729c0c70a92fdcb8d3
Author: Kjell Randa <kranda at broadpark.no>
Date:   Tue Jul 31 09:28:38 2007 +0200

    Fixed Fedora specfile for Fedora 7 and collectd 4.0.5
    
    Hi,
    
    Here is a working spec file for Fedora 7.
    Copy the tar.gz file to /usr/src/redhat/SOURCES and run
      rpmbuild -ba collectd.spec
    It has only been tested on  x86_64, but I well see if I can find time to test
    on x86 as well.
    
    Upgrade not tested.
    
    The file /etc/collection.conf referenced in collection.cgi is missing in the
    tar file and not installed by the spec file.
    
    Regards
    Kjell Randa

commit 8160b214d70d04bfde66b788ea1a25ec99044cde
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Mon Jul 30 22:43:26 2007 +0200

    syslog plugin: Call `openlog' right when the plugin is loaded.

commit 5c57fce289cf14a4df81bdfd64d1469580bceff3
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Mon Jul 30 20:15:31 2007 +0200

    sensors plugin: Fix the use of the ignorelist, so it matches the documentation.