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

[Florian Forster]

 src/exec.c |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

New commits:
commit b58af48a482b30999bd0b71c470c5dbab8fd5abd
Merge: 2fe27dcde5e7839375ab10e75293be531f50838e 3469385f04ffcfa2f4ef06d34ed4b24acb378b34
Author: Florian Forster <octo at crystal.wlan.home.verplant.org>
Date:   Wed Apr 9 18:45:38 2008 +0200

    Merge branch 'collectd-4.3'
    
    Conflicts:
    
    	src/exec.c

commit 3469385f04ffcfa2f4ef06d34ed4b24acb378b34
Merge: 79e2f5ddc8bffe7ba604530b6090b5d7f7ec9bb1 7af919ac4b76af981002875ff7bef99874f745b7
Author: Florian Forster <octo at crystal.wlan.home.verplant.org>
Date:   Wed Apr 9 18:34:48 2008 +0200

    Merge branch 'collectd-4.2' into collectd-4.3
    
    Conflicts:
    
    	src/exec.c

commit 7af919ac4b76af981002875ff7bef99874f745b7
Author: Florian Forster <octo at crystal.wlan.home.verplant.org>
Date:   Wed Apr 9 18:32:14 2008 +0200

    exec plugin: Close all file descriptors but the one connected to the pipe.