Merge branch 'collectd-5.6' into collectd-5.7
authorFlorian Forster <octo@collectd.org>
Fri, 12 May 2017 09:16:43 +0000 (11:16 +0200)
committerFlorian Forster <octo@collectd.org>
Fri, 12 May 2017 09:16:43 +0000 (11:16 +0200)
commit632cca47086de6cb23c32fc35802da1a19f40875
tree9ecd022cff38c260fc5cc7f6a48f53969a5cc2ac
parent42b8d7550d029ed9aef6f25e3eb2009c1f18b144
parentc3e2a69bd600fa4c4a9d4603094f39ea81c11116
Merge branch 'collectd-5.6' into collectd-5.7
configure.ac
src/bind.c
src/collectd.conf.pod