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

[Florian Forster]

 ChangeLog           |   27 ++++++++++++++++++++++++++-
 src/apple_sensors.c |    2 +-
 src/processes.c     |    2 +-
 version-gen.sh      |    2 +-
 4 files changed, 29 insertions(+), 4 deletions(-)

New commits:
commit 7471e073bff7c9f2542bc1c8ce639b85c5498ba7
Merge: 582170bf0c235c07a10265c93eced7a66ddeb902 714644fb443eb2dc8fd8c683cae171caef40cf7a
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Thu Sep 4 15:01:23 2008 +0200

    Merge branch 'collectd-4.4'

commit 714644fb443eb2dc8fd8c683cae171caef40cf7a
Merge: d164514834928b3cc5feacb2698b4329fa986b8d db0ab1056d34e5f77bf47e762b85ec01cf85a2a8
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Thu Sep 4 15:01:06 2008 +0200

    Merge branch 'collectd-4.3' into collectd-4.4

commit db0ab1056d34e5f77bf47e762b85ec01cf85a2a8
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Thu Sep 4 15:00:40 2008 +0200

    processes plugin: Fix a format string.

commit 582170bf0c235c07a10265c93eced7a66ddeb902
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Thu Sep 4 14:58:57 2008 +0200

    apple_sensors plugin: Add a missing semicolon.

commit 0af86c079863ee1c057b8198062aaa3a9d2cd86c
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Thu Sep 4 10:52:34 2008 +0200

    Bumped version to 4.5.0.

commit 8a277e54b4ed7bccb4b3a2e7668792cd5303d3ac
Merge: 603bd7010a138853ede98be4809b914f104bdd63 d164514834928b3cc5feacb2698b4329fa986b8d
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Thu Sep 4 10:49:13 2008 +0200

    Merge branch 'collectd-4.4'
    
    Conflicts:
    
    	ChangeLog

commit d164514834928b3cc5feacb2698b4329fa986b8d
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Mon Sep 1 13:37:27 2008 +0200

    Bumped version to 4.4.3; Updated ChangeLog.

commit 6acb19befc321c501e4d8b79f403ebda0c021acc
Merge: 3f2f61c7d74d9204405a4b0c21390451c98665a7 759febb0c6b26e5bc470123efb5d10668595af67
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Mon Sep 1 08:04:10 2008 +0200

    Merge branch 'collectd-4.3' into collectd-4.4
    
    Conflicts:
    
    	ChangeLog
    	version-gen.sh

commit 759febb0c6b26e5bc470123efb5d10668595af67
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Mon Sep 1 08:01:33 2008 +0200

    ChangeLog: Entry for 4.3.4: Bring plugins in alphabetical order.

commit 9b80c3781f09b3803f32188a97456f4fa41aa2fa
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sun Aug 31 15:11:15 2008 +0200

    Bumped version to 4.3.3; Updated ChangeLog.