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

[Florian Forster]

 src/conntrack.c |   43 ++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 38 insertions(+), 5 deletions(-)

New commits:
commit c01a8a74399648f8b44b2fb39366cece051b61ad
Merge: 617ab1a c97395d
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date:   Thu Jan 16 01:48:43 2014 -0800

    Merge pull request #497 from pyr/feature-conntrack-pct
    
    Report used, max and percent values for conntrack consumption

commit c97395d5240ab9b3a52a77202b110ce527f88b18
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date:   Wed Jan 15 15:23:24 2014 +0100

    integrate comments by @octo

commit c66eedcd0cae3019928e03c9c38538fca10d59c8
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date:   Wed Jan 15 14:10:13 2014 +0100

    provide conntrack percentage values