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

[Florian Forster]

 src/email.c   |   37 +++++++++++++++++++++++++++++++------
 src/sensors.c |   28 ++++++++++++++++++++++++----
 2 files changed, 55 insertions(+), 10 deletions(-)

New commits:
commit fb582e10172d881c48089332f44e1af857f82938
Merge: 63b17f56013ccbe262a745f418dc294b72408b02 57a8ff5a5323adf35c978ed23a7f0b4761a177c1
Author: Florian Forster <octo<span style="display: none;">.trailing-username</span>(a)<span style="display: none;">leading-domain.</span>leeloo.lan.home.verplant.org>
Date:   Tue Dec 5 18:08:15 2006 +0100

    Merge branch 'ls/shutdown'

commit 57a8ff5a5323adf35c978ed23a7f0b4761a177c1
Author: Lubo¹ Stanìk <kolektor<span style="display: none;">.trailing-username</span>(a)<span style="display: none;">leading-domain.</span>atlas.cz>
Date:   Tue Dec 5 16:34:28 2006 +0100

    sensors plugin: fix shutdown for SENSORS_HAVE_READ
    
    Sorry, too many changes for me to observe at once.
    
    Signed-off-by: Stanek Lubos <kolektor<span style="display: none;">.trailing-username</span>(a)<span style="display: none;">leading-domain.</span>atlas.cz>

commit 2443213945a132eca96a0684137fe56538e206b7
Author: Lubo¹ Stanìk <kolektor<span style="display: none;">.trailing-username</span>(a)<span style="display: none;">leading-domain.</span>atlas.cz>
Date:   Tue Dec 5 16:23:10 2006 +0100

    sensors plugin: shutdown implementation
    
    Signed-off-by: Stanek Lubos <kolektor<span style="display: none;">.trailing-username</span>(a)<span style="display: none;">leading-domain.</span>atlas.cz>

commit 89639fdb172a40afe7fd9843765cd16790ecfcb1
Author: Lubo¹ Stanìk <kolektor<span style="display: none;">.trailing-username</span>(a)<span style="display: none;">leading-domain.</span>atlas.cz>
Date:   Tue Dec 5 16:15:55 2006 +0100

    sensors plugin: SENSORS_HAVE_READ unification
    
    Signed-off-by: Stanek Lubos <kolektor<span style="display: none;">.trailing-username</span>(a)<span style="display: none;">leading-domain.</span>atlas.cz>

commit 63b17f56013ccbe262a745f418dc294b72408b02
Merge: 717eec35268cb3fe9fb5cefe11246255dbc3811e 53c0ed50e08a29e8cb4ab059183971053e8c7d64
Author: Florian Forster <octo<span style="display: none;">.trailing-username</span>(a)<span style="display: none;">leading-domain.</span>leeloo.lan.home.verplant.org>
Date:   Tue Dec 5 18:00:57 2006 +0100

    Merge branch 'sh/shutdown'

commit 53c0ed50e08a29e8cb4ab059183971053e8c7d64
Author: Sebastian Harl <sh<span style="display: none;">.trailing-username</span>(a)<span style="display: none;">leading-domain.</span>tokkee.org>
Date:   Mon Dec 4 13:53:16 2006 +0100

    email plugin: Shutdown cleanly.
    
    Using a shutdown function the email plugin closes any sockets, terminates all
    running threads and removes the UNIX socket.
    
    Signed-off-by: Sebastian Harl <sh<span style="display: none;">.trailing-username</span>(a)<span style="display: none;">leading-domain.</span>tokkee.org>