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

[Florian Forster]

 configure.in                   |   17 +++++++++++++----
 src/collectd-nagios.c          |    6 +++---
 src/exec.c                     |   12 ++++++++++++
 src/libcollectdclient/client.h |    4 +++-
 4 files changed, 31 insertions(+), 8 deletions(-)

New commits:
commit 37676c3b280e15df8efbef2a3dc6c9096d1ae03b
Merge: bf3e1d8dac9fc28687a4c91160ed6d944048eb09 0bd574a28c06090f0c4b056f8a78e455455a6330
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sat May 1 09:36:08 2010 +0200

    Merge branch 'collectd-4.9'
    
    Conflicts:
    	configure.in

commit 0bd574a28c06090f0c4b056f8a78e455455a6330
Merge: 7fc9c92bd22bf69bdf4b6b85ce6f2dc692ff0869 aaa30a38b12e500f687c2bfdf069fe8f1d9b1b66
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sat May 1 09:35:01 2010 +0200

    Merge branch 'collectd-4.8' into collectd-4.9

commit aaa30a38b12e500f687c2bfdf069fe8f1d9b1b66
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Thu Apr 29 09:57:18 2010 +0200

    configure.in: Put conditionals around <inttypes.h>, too, for consistency's sake.

commit e857aa81d2ad221f01b9c9243f8bdd5fe4f57844
Author: Aurélien Reynaud <collectd at wattapower.net>
Date:   Thu Apr 29 09:39:48 2010 +0200

    Solaris 8 fixes: Check for <stdint.h> before inclusion.

commit 7fc9c92bd22bf69bdf4b6b85ce6f2dc692ff0869
Author: Aurélien Reynaud <collectd at wattapower.net>
Date:   Thu Apr 29 09:37:57 2010 +0200

    Solaris 8 fixes: Fall back to putenv(3).

commit 106e2016957fe53e4d249f1352bb5a7ec9caa76b
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sun Apr 25 15:32:50 2010 +0200

    collectd-nagios.c: Output performance data with the "%f" format string.
    
    Apparently the parser used by nagios is dumb as bread. Thanks to Lao Wai
    for pointing this out. For more information, see:
    <http://nagiosplug.sourceforge.net/developer-guidelines.html#AEN201>