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

[Florian Forster]

 configure.in           |    2 ++
 src/collectd.h         |    2 +-
 src/common.c           |    4 ++++
 src/plugin.c           |   12 ++++++++++++
 src/utils_ignorelist.c |    4 ++++
 src/utils_mount.c      |    4 +++-
 6 files changed, 26 insertions(+), 2 deletions(-)

New commits:
commit 44e4d530c8db2e078cd73ab254d1be41a5f2812c
Merge: 42c56b58e385b7a45ab0d2287a4042e53ae22c07 3a4405009e53f578c26c22073920cc5b4ffa6eca
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Tue May 15 19:27:31 2007 +0200

    Merge branch 'master' into collectd-4
    
    Conflicts:
    
    	src/multimeter.c
    	src/network.c
    	src/utils_debug.c

commit 3a4405009e53f578c26c22073920cc5b4ffa6eca
Merge: bb743c17dda8f0c51828c62a7b8ec98bdaa9bfcf 15e541d6bd585ff532c99b0c882339c3608c8be2
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Tue May 15 19:22:25 2007 +0200

    Merge branch 'collectd-3.11'

commit 15e541d6bd585ff532c99b0c882339c3608c8be2
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Tue May 15 19:20:27 2007 +0200

    Include "config.h" rather than <config.h>.

commit 9e7918de3468233376be0cb0c7c7ab5a06ef8bce
Author: Sebastian Harl <sh at tokkee.org>
Date:   Mon May 14 20:57:03 2007 +0200

    [PATCH] Added large file support ("backported" to collectd-3).
    
    This adds large file support to collectd by using the AC_SYS_LARGEFILE macro
    in configure.in. In order to apply any necessary options to all parts of
    collectd, we have to make sure config.h is included in all source files
    (either directly or by including collectd.h) and before any other header files
    are included.
    
    This should fix http://bugs.debian.org/422212.
    
    Signed-off-by: Sebastian Harl <sh at tokkee.org>

commit 42c56b58e385b7a45ab0d2287a4042e53ae22c07
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Tue May 15 15:30:42 2007 +0200

    src/plugin.c: assert (ds->ds_num == vl->values_len); when debug is enabled.