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

[Florian Forster]

 src/tcpconns.c |  210 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 198 insertions(+), 12 deletions(-)

New commits:
commit 531f59523e969b498c570f9f7083bf41b6811773
Merge: 60132b6 f52ebcb
Author: Florian Forster <octo at collectd.org>
Date:   Mon Aug 27 08:39:17 2012 +0200

    Merge branch 'ms/tcpconns'

commit f52ebcb1bc8e170909078eb3eb2e3d103e4ca9d2
Author: Florian Forster <octo at collectd.org>
Date:   Mon Aug 27 08:35:29 2012 +0200

    tcpconns plugin: Only chose between netlink / proc on the first iteration.
    
    Rather than going for netlink each iteration and fall back to /proc, try
    this on the first iteration only and stick with the result afterwards.
    Also contains some improvements to the error handling / reporting.

commit 44f3746a9b683de34128bc34b1135afa0a10060d
Author: Michael Stapelberg <michael at stapelberg.de>
Date:   Fri Aug 24 23:02:26 2012 +0200

    little style changes (code review)

commit d94a7f0dac9c46b94a4681940809ae13cd1aa5dd
Author: Michael Stapelberg <michael at stapelberg.de>
Date:   Tue Aug 7 12:41:38 2012 +0200

    tcpconns/linux: Use netlink instead of parsing /proc/net/tcp{,6}