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

[Florian Forster]

 configure.in      |   55 ++++++++++++++++++++++++++++++++++++++++++++++------
 src/Makefile.am   |    3 +-
 src/collectd.h    |   12 +++++++++++
 src/swap.c        |    3 ++
 src/utils_mount.c |    4 +-
 src/utils_mount.h |    4 +--
 6 files changed, 67 insertions(+), 14 deletions(-)

New commits:
commit 0f74e253aeb26c3b4908fdced0a00c7c1f2ad5cd
Merge: bc51ef217e871b80152eccd4e5f32659500f75f3 f71895576cbd4b488cd66f0c96efb6fd3e7a6faf
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sat May 9 12:59:50 2009 +0200

    Merge branch 'collectd-4.7'

commit f71895576cbd4b488cd66f0c96efb6fd3e7a6faf
Merge: 5f3f72cbb9e67977ae44a311a826e767f4d6f45f 37905c5a2370c8e6edae5011978773eeaa589d09
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sat May 9 12:39:12 2009 +0200

    Merge branch 'collectd-4.6' into collectd-4.7

commit 37905c5a2370c8e6edae5011978773eeaa589d09
Merge: a940e2555464956ae7b61d8d0d742f2acc001c5f 39f3ecb1fc15fb1978c7ac6ccc1c6a9091785604
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sat May 9 12:29:44 2009 +0200

    Merge branch 'collectd-4.5' into collectd-4.6

commit 39f3ecb1fc15fb1978c7ac6ccc1c6a9091785604
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Sat May 9 11:08:48 2009 +0200

    configure.in: Hint towards the CFLAGS instead of using $CC.

commit 78097289fe1ff3a436d876494271cc82b7a6594c
Author: Doug MacEachern <dougm at hyperic.com>
Date:   Fri May 8 18:54:51 2009 -0700

    configure.in: Add hint for building solaris 64-bit binary.
    
    Signed-off-by: Doug MacEachern <dougm at hyperic.com>
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>

commit 5f3f72cbb9e67977ae44a311a826e767f4d6f45f
Author: Doug MacEachern <dougm at hyperic.com>
Date:   Thu May 7 23:13:48 2009 -0700

    configure.in: Check libgcrypt minimum version 1.2.0.
    
    Signed-off-by: Doug MacEachern <dougm at hyperic.com>
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>

commit 168e74014bfd5ab70ffd8c40f877ec55879a8e92
Author: Doug MacEachern <dougm at hyperic.com>
Date:   Fri May 8 17:35:03 2009 -0700

    swap module: Include <vm/anon.h> on Solaris.
    
    Signed-off-by: Doug MacEachern <dougm at hyperic.com>
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>

commit 2b65cef7870c385b9b56b34701ced62528f3f7c0
Author: Doug MacEachern <dougm at hyperic.com>
Date:   Thu May 7 18:05:01 2009 -0700

    configure.in: Check for `mysql_get_server_version' in libmyql.
    
    Signed-off-by: Doug MacEachern <dougm at hyperic.com>
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>

commit 9e0809db22aa694d9edad9dd74515d655dc70579
Author: Doug MacEachern <dougm at hyperic.com>
Date:   Thu May 7 12:50:17 2009 -0700

    configure.in: Use AC_HEADER_STDBOOL
    
    Signed-off-by: Doug MacEachern <dougm at hyperic.com>
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>

commit a940e2555464956ae7b61d8d0d742f2acc001c5f
Merge: a1ae4b5afaf3207a7070b85f802b41b32c0b9a20 eafb8003851eaea28dfe90b094fbd6be28a38c92
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Wed May 6 16:37:18 2009 +0200

    Merge branch 'collectd-4.5' into collectd-4.6
    
    Conflicts:
    
    	src/Makefile.am

commit eafb8003851eaea28dfe90b094fbd6be28a38c92
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Wed May 6 16:28:27 2009 +0200

    Build system: Straighten up building of the DF plugin.
    
    In rare cases, e. g. Solaris, getmntent is available but neither the one nor
    the two argument version could be recognized. This lead to `cu_mount_getlist'
    returning NULL without an error, leading to the df plugin fail without notice.
    
    While at it I re-implemented the dependency checking of the DF plugin to match
    the proprocessor logic in utils_mount.c.