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

[Florian Forster]

 ChangeLog              |   30 ++++++++++++
 configure.in           |  124 +++++++++++++++++++++++++++++++++++++++++-------
 contrib/collection.cgi |  108 ++++++++++++-----------------------------
 contrib/migrate-3-4.px |    3 +-
 src/Makefile.am        |  101 +++++++++++++++++----------------------
 src/sensors.c          |    4 +-
 src/types.db           |    2 +-
 version-gen.sh         |    2 +-
 8 files changed, 219 insertions(+), 155 deletions(-)

New commits:
commit d98487a27d294e31f483b9d43e0d6c02717d248c
Merge: 6b49eec15d421a74935fb1165c3e9fdb80ca838e 0aad516f24e861109627f4b1dc5bfea3b1f621c1
Author: Florian Forster <octo at noris.net>
Date:   Tue Apr 29 17:45:16 2008 +0200

    Merge branch 'collectd-4.4'
    
    Conflicts:
    
    	src/sensors.c

commit 0aad516f24e861109627f4b1dc5bfea3b1f621c1
Merge: 409d90064967451241f5fcc672a26269142e1735 c74b709edf61a3b7dfc24032f609956f0feb56e7
Author: Florian Forster <octo at noris.net>
Date:   Tue Apr 29 17:44:26 2008 +0200

    Merge branch 'collectd-4.3' into collectd-4.4

commit c74b709edf61a3b7dfc24032f609956f0feb56e7
Merge: d5e428c8fc7e1423e3082492274547c708b1cec3 d8a27138e0fc455088443ca034942a00c3b4eecd
Author: Florian Forster <octo at noris.net>
Date:   Tue Apr 29 17:43:27 2008 +0200

    Merge branch 'collectd-4.2' into collectd-4.3

commit d8a27138e0fc455088443ca034942a00c3b4eecd
Merge: 4aed4a7a08b80608c532d2da7eb7fe43c2945e13 9408d0b6c09eda66861826debd7f63a1e0cf5aea
Author: Florian Forster <octo at noris.net>
Date:   Tue Apr 29 17:43:19 2008 +0200

    Merge branch 'collectd-4.2' of git://git.verplant.org/collectd into collectd-4.2

commit d5e428c8fc7e1423e3082492274547c708b1cec3
Merge: c192de2c944bf9c73903b4a6ac8379db3acc5955 8caa0d691d9f6c22013aeaea7b6aa97be9f0a862
Author: Florian Forster <octo at noris.net>
Date:   Tue Apr 29 17:43:04 2008 +0200

    Merge branch 'collectd-4.3' of git://git.verplant.org/collectd into collectd-4.3

commit 6b49eec15d421a74935fb1165c3e9fdb80ca838e
Merge: 699191de572aca61ad919306391073067f2d7ccc c192de2c944bf9c73903b4a6ac8379db3acc5955
Author: Florian Forster <octo at noris.net>
Date:   Tue Apr 29 17:42:07 2008 +0200

    Merge branch 'collectd-4.3'

commit c192de2c944bf9c73903b4a6ac8379db3acc5955
Merge: ae6f041d23a71073e447f50f01e5d9ec1ffb34bd 4aed4a7a08b80608c532d2da7eb7fe43c2945e13
Author: Florian Forster <octo at noris.net>
Date:   Tue Apr 29 16:52:08 2008 +0200

    Merge branch 'collectd-4.2' into collectd-4.3
    
    Conflicts:
    
    	src/Makefile.am

commit 4aed4a7a08b80608c532d2da7eb7fe43c2945e13
Author: Florian Forster <octo at noris.net>
Date:   Tue Apr 29 11:34:22 2008 +0200

    build system: Use pkg-config to determine flags for the statgrab library.

commit ae6f041d23a71073e447f50f01e5d9ec1ffb34bd
Author: Florian Forster <octo at noris.net>
Date:   Tue Apr 29 10:27:38 2008 +0200

    build system: Don't (accidentally) clear the LDFLAGS when checking for libxml2 or libvirt.

commit 699191de572aca61ad919306391073067f2d7ccc
Author: Florian Forster <octo at noris.net>
Date:   Wed Apr 9 11:05:52 2008 +0200

    src/types.db: Converted spaces to tabs.
    
    Actually spaces would be nicer, but all lines but one used tabs..

commit 8caa0d691d9f6c22013aeaea7b6aa97be9f0a862
Author: Florian Forster <sifnfors at informatik.stud.uni-erlangen.de>
Date:   Tue Apr 22 13:18:21 2008 +0200

    Bumped version to 4.3.3; Updated ChangeLog.

commit bec5a6dda77c05eae27e5aeecdf601e573090cc5
Merge: 5aac2498eeacce2ab28302bca2103960a11474f7 9408d0b6c09eda66861826debd7f63a1e0cf5aea
Author: Florian Forster <sifnfors at informatik.stud.uni-erlangen.de>
Date:   Tue Apr 22 13:17:05 2008 +0200

    Merge branch 'collectd-4.2' into collectd-4.3

commit 9408d0b6c09eda66861826debd7f63a1e0cf5aea
Author: Florian Forster <sifnfors at informatik.stud.uni-erlangen.de>
Date:   Tue Apr 22 13:16:34 2008 +0200

    ChangeLog: Add missing notes about _REENTRANT and the sensors plugin.

commit 5aac2498eeacce2ab28302bca2103960a11474f7
Merge: 1584314f015f98abc61e74fdd6e47e200c8d02aa c3e81ce5e320472d9d5789c092886e301905011c
Author: Florian Forster <sifnfors at informatik.stud.uni-erlangen.de>
Date:   Tue Apr 22 13:11:46 2008 +0200

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

commit c3e81ce5e320472d9d5789c092886e301905011c
Author: Florian Forster <octo at crystal.wlan.home.verplant.org>
Date:   Tue Apr 22 10:28:20 2008 +0200

    Bumped version to 4.2.7; Updated ChangeLog.

commit 8672bfabe38b28694487a4b896f24fb09162c161
Author: Sebastian Harl <sh at tokkee.org>
Date:   Fri Apr 18 14:54:50 2008 +0200

    migrate-3-4.px: Rename vs_processes's data source from "total" to "value".
    
    Signed-off-by: Sebastian Harl <sh at tokkee.org>
    Signed-off-by: Florian Forster <octo at verplant.org>

commit 33bff149ad50a39f2d21fa116cd2d44179097a0b
Author: Sebastian Harl <sh at tokkee.org>
Date:   Fri Apr 18 14:53:50 2008 +0200

    collection.cgi: Updated "vserver" graph definitions to version 4.
    
    Signed-off-by: Sebastian Harl <sh at tokkee.org>
    Signed-off-by: Florian Forster <octo at verplant.org>

commit a67c726a4c669088eb40da491d9d41826e1388a9
Author: Florian Forster <octo at verplant.org>
Date:   Fri Apr 18 07:23:48 2008 +0200

    sensors plugin: Fix the return status of `sensors_snprintf_chip_name'.
    
    The function should return <0 only if an error occured, but in two out of three
    branches the initial status of -1 was not modified. This may have rendered the
    sensors plugin unusable for some people.

commit f1075c2272062a581dabbc4fb4411c5d1f97acc5
Author: Sebastian Harl <sh at tokkee.org>
Date:   Wed Apr 16 18:53:30 2008 +0200

    configure: Build perl bindings only if a perl interpreter is available.
    
    For this purpose a check for the perl interpreter has been added. As the
    check for libperl requires a perl interpreter as well (to get the compiler
    and linker flags) the perl module will be disabled as well if a perl
    interpreter is not available.
    
    Signed-off-by: Sebastian Harl <sh at tokkee.org>
    Signed-off-by: Florian Forster <octo at verplant.org>