Code

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)
commitf9a6df05238501ca41931af0d8d51acea716c105
tree1eceae59874709104a9f97b529202b4f4c32d132
parent791e99923dbbf045b11fbd7b0ea8df647e29593e
parentac8f02ab4f25a6b62ec763a74442ae2d65450679
Merge branch 'collectd-5.4' into collectd-5.5
src/daemon/common.c
src/daemon/filter_chain.c
src/daemon/meta_data.c
src/libcollectdclient/network.c