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

[Florian Forster]

 bindings/Makefile.am  |   12 ++++----
 src/collectd.conf.pod |    6 ++++
 src/configfile.c      |    2 -
 src/libvirt.c         |   73 +++++++++++++++++++-------------------------------
 4 files changed, 42 insertions(+), 51 deletions(-)

New commits:
commit b49f3f8aca3b42e64427259dfc6c75242d37b91c
Merge: c2204eefe8ab6f0214144866dbcb7738855b7cd8 225494e854ddaa1c0570ac9a5fa15380b333a919
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Thu Jan 10 09:49:02 2008 +0100

    Merge branch 'collectd-4.2'

commit 225494e854ddaa1c0570ac9a5fa15380b333a919
Merge: 4d3df62c2da0ac48723cab5089a84e85938b9d97 79f871e0c04262f4769d23324236ce75d0b04d3f
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Thu Jan 10 09:48:52 2008 +0100

    Merge branch 'collectd-4.1' into collectd-4.2

commit 79f871e0c04262f4769d23324236ce75d0b04d3f
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Thu Jan 10 09:48:24 2008 +0100

    src/configfile.c: Updated the copyright notice for 2008.

commit c2204eefe8ab6f0214144866dbcb7738855b7cd8
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Thu Jan 10 09:47:20 2008 +0100

    libvirt plugin: Updated the copyright notice for 2008.

commit 1df885d0f2d6eb7f9d965b7b0da53e5d78a0a989
Author: Richard Jones <rjones at redhat.com>
Date:   Thu Jan 10 09:43:32 2008 +0100

    libvirt plugin: Fix the HostnameFormat option.
    
    The attached patch fixes HostnameFormat in libvirt driver.
    
    The intended use for this was:
    
       HostnameFormat "name"
    
    generating hostnames like "<guestname>" (the default case), and:
    
       HostnameFormat "hostname name"
    
    generating hostnames like "<hostname>:<guestname>".
    
    Somewhere along the way, however, that code got broken so it always adds a ":"
    before the name, and doesn't concatenate any more, so you'd get weird hostnames
    appearing like ":guest" which was supposed to be "hostname:guest".
    
    The patch just reverts back to my original code.
    
    Rich.

commit 4d3df62c2da0ac48723cab5089a84e85938b9d97
Author: Sebastian Harl <sh at tokkee.org>
Date:   Wed Jan 9 08:33:52 2008 +0100

    bindings/Makefile.am: Replaced "make -C" with "cd && make".
    
    BSD make does not support "make -C".
    
    Signed-off-by: Sebastian Harl <sh at tokkee.org>
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>

commit c190252c31ca4e3c4871120ae9d4288ae64ff053
Author: Sebastian Harl <sh at tokkee.org>
Date:   Sun Jan 6 20:11:29 2008 +0100

    bindings/Makefile.am: Removed a bashism.
    
    Brace expansion using { and } is not defined by POSIX but rather a bash
    extension and should thus not be used for portability reasons.
    
    Signed-off-by: Sebastian Harl <sh at tokkee.org>
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>

commit 06f68d65c3021a3e08839ceeb558e9a30a9170d9
Author: Sebastian Harl <sh at tokkee.org>
Date:   Wed Jan 9 08:29:36 2008 +0100

    collectd.conf(5): Added a note about the availability of the "debug" loglevel.
    
    Signed-off-by: Sebastian Harl <sh at tokkee.org>
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>