]> git.ipfire.org Git - thirdparty/collectd.git/commitdiff
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)
1  2 
configure.ac
src/daemon/configfile.c
src/statsd.c
src/tcpconns.c
src/utils_dns.c
src/vmem.c

diff --cc configure.ac
Simple merge
Simple merge
diff --cc src/statsd.c
Simple merge
diff --cc src/tcpconns.c
Simple merge
diff --cc src/utils_dns.c
Simple merge
diff --cc src/vmem.c
Simple merge