Merge branch 'collectd-5.4' into collectd-5.5
authorFlorian Forster <octo@collectd.org>
Thu, 11 Jun 2015 06:50:12 +0000 (07:50 +0100)
committerFlorian Forster <octo@collectd.org>
Thu, 11 Jun 2015 06:50:12 +0000 (07:50 +0100)
commitcedb6f147e94d0e952449f731313412ef4d67904
tree3e1a4d9c1b6203febc8084c5cf1d79bcd65dc287
parentb545dbd106a9a3c713041934aaa818a17cb1db10
parent21ba59f8197dba0a72dbf5186bc0a5d7e5074496
Merge branch 'collectd-5.4' into collectd-5.5
configure.ac
src/daemon/configfile.c
src/statsd.c
src/tcpconns.c
src/utils_dns.c
src/vmem.c