]> git.ipfire.org Git - thirdparty/collectd.git/commitdiff
Merge branch 'collectd-5.4' into collectd-5.5
authorFlorian Forster <octo@collectd.org>
Sat, 5 Dec 2015 22:07:14 +0000 (23:07 +0100)
committerFlorian Forster <octo@collectd.org>
Sat, 5 Dec 2015 22:07:14 +0000 (23:07 +0100)
1  2 
src/daemon/common.c
src/daemon/filter_chain.c
src/daemon/meta_data.c
src/libcollectdclient/network.c

Simple merge
Simple merge
Simple merge
Simple merge