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

[Florian Forster]

 src/collectd.conf.pod |    6 ++++++
 src/configfile.c      |    4 +++-
 src/unixsock.c        |    3 +++
 3 files changed, 12 insertions(+), 1 deletion(-)

New commits:
commit d2914ae1474b2d42120c65c3f48be0be7affcb4e
Merge: 7e541dd871f040c19ad6eaada86f1f6d61cff204 c89c9b7b5e498e5a77c6eb1b1a88593fcced85f5
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Tue Jan 8 11:23:36 2008 +0100

    Merge branch 'collectd-4.2'

commit c89c9b7b5e498e5a77c6eb1b1a88593fcced85f5
Merge: ce6906b4b8a38a98f2ba6eb2af7b8eadf0a9be02 476256bd637ce9789dbeec4d25c8937bdfc9bac2
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Tue Jan 8 11:23:28 2008 +0100

    Merge branch 'collectd-4.1' into collectd-4.2
    
    Conflicts:
    
    	src/collectd.conf.pod

commit 476256bd637ce9789dbeec4d25c8937bdfc9bac2
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Tue Jan 8 11:08:41 2008 +0100

    collectd.conf(5): Documented the fact that the configuration is processes from top to bottom.

commit 1603d1e183b501c05f3c227d4e1644cf10bee263
Author: Luke Heberling <collectd at c-ware.com>
Date:   Thu Dec 13 08:03:03 2007 +0100

    collectd.conf(5): Added a note about plugin loading order.

commit cb5b625fa09da45247b35e96257cd290987e1a53
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Tue Jan 8 10:52:44 2008 +0100

    src/configfile.c: Improve the "Plugin `%s' did not register a callback." warning.

commit e1d06974730499ad4abf876eb13bf5df7d012cdf
Author: Evgeny Chukreev <akshaal at toril.ru>
Date:   Sun Jan 6 10:00:06 2008 +0100

    unixsock plugin: Actually set the permissions for the socket.
    
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>