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

[Florian Forster]

 src/battery.c                  |   17 +++++++++++++++--
 src/cpu.c                      |    4 +++-
 src/interface.c                |    2 +-
 src/libcollectdclient/client.c |    9 +++++++++
 src/memory.c                   |    2 +-
 src/mysql.c                    |    5 +++--
 src/openvpn.c                  |    2 +-
 src/processes.c                |    2 ++
 8 files changed, 35 insertions(+), 8 deletions(-)

New commits:
commit cfb86a0f119d0ee0e72a920ba1251bb0350cf08b
Merge: 5f2f461a0a08fb6f36762b59423c38b9315755b8 9b626288aff81c68fe19210a58b4a32eeefde9d3
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sat Apr 18 01:06:23 2009 +0200

    Merge branch 'collectd-4.6'
    
    Conflicts:
    	src/mysql.c
    	src/ping.c

commit 9b626288aff81c68fe19210a58b4a32eeefde9d3
Merge: 4ea822d83441f31e816d0742f1276bb501a0cb11 12f08ff05e4f451232072c52f1383a0fb97db707
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sat Apr 18 01:04:48 2009 +0200

    Merge branch 'collectd-4.5' into collectd-4.6
    
    Conflicts:
    	src/cpu.c

commit 4ea822d83441f31e816d0742f1276bb501a0cb11
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sat Apr 18 01:02:59 2009 +0200

    src/libcollectdclient/: Check if EILSEQ is defined.
    
    And fall back to EPROTO or EINVAL if it is not, e. g. under FreeBSD.

commit 12f08ff05e4f451232072c52f1383a0fb97db707
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sat Apr 18 00:55:59 2009 +0200

    interface, memory, ping plugins: Update copyright information.

commit cb5609c683d5ad90a0f57ba67b1d0494b4302141
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sat Apr 18 00:55:23 2009 +0200

    openvpn plugin: Correct copyright information.

commit 1d4cdb75eeb13910a640520c2e3192f962045b0d
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Fri Apr 17 18:19:59 2009 +0200

    cpu plugin: Updated copyright information.

commit 30baaadb710eedf7f293164be4e4ab65423641c9
Author: Florian Forster <octo at noris.net>
Date:   Fri Apr 17 17:43:12 2009 +0200

    mysql plugin: Fix a typo in my previous patch.
    
    D'oh!

commit c5c7a3b493b6dbb246fff39e401d49cd454460a9
Author: Florian Forster <octo at noris.net>
Date:   Fri Apr 17 17:38:42 2009 +0200

    mysql plugin: Updated copyright information.

commit 353ad874e44c7ffa1faa62a34ca2c40b0f047095
Author: Doug MacEachern <dougm at hyperic.com>
Date:   Thu Apr 16 19:53:49 2009 -0700

    Set process vmem_size and stack_size on FreeBSD
    
       Fixes:
       processes.c: In function 'ps_read':
       processes.c:328: warning: 'pse.vmem_size' is used uninitialized in this function
       processes.c:1300: note: 'pse.vmem_size' was declared here
       processes.c:330: warning: 'pse.stack_size' is used uninitialized in this function
       processes.c:1300: note: 'pse.stack_size' was declared here
    
    Signed-off-by: Doug MacEachern <dougm at hyperic.com>
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>

commit 0c0db283184765cb40fcd8cd52735b6e2cc7db31
Author: Sebastian Harl <sh at tokkee.org>
Date:   Tue Mar 10 22:06:10 2009 +0100

    battery plugin: Don't complain about missing /proc/acpi/battery each interval.
    
    Instead, complain once when the read callback is called for the first time.