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

[Florian Forster]

 src/daemon/common.c |    2 +-
 src/df.c            |    2 +-
 src/tcpconns.c      |    8 ++++++--
 3 files changed, 8 insertions(+), 4 deletions(-)

New commits:
commit 79593ed5e0a3def8e91be5b1de15a536af2d4a92
Merge: ba5d000 6966c22
Author: Florian Forster <octo at collectd.org>
Date:   Sun Jun 28 15:05:36 2015 +0200

    Merge branch 'collectd-5.4' into collectd-5.5

commit 6966c22daad028359bac6747d709416a64779d6a
Author: Florian Forster <octo at collectd.org>
Date:   Sun Jun 28 14:05:05 2015 +0200

    src/daemon/common.c: Fix off-by-one error in escape_slashes().
    
    Partial cherry-pick of 0cba91923be9326224f8434e4aae7691f7b6dad1.

commit 924c9af78d535f4920d73a2cd8e5090747479f0f
Author: Landry Breuil <landry at rhaalovely.net>
Date:   Wed Jun 24 06:48:16 2015 +0200

    properly handle error cases when kvm_read fails (#1094)

commit 305fccf949726b6dcaea65919c9adcbd342919f6
Author: Marek Becka <marek.becka at superhosting.cz>
Date:   Wed Jun 24 11:39:55 2015 -0400

    don't report inodes if fs doesn't provide f_files and f_ffree