Merge branch 'collectd-5.7'
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Thu, 1 Jun 2017 18:38:17 +0000 (20:38 +0200)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Thu, 1 Jun 2017 18:38:17 +0000 (20:38 +0200)
commit47c86ace348a1d7a5352a83d10935209f89aa4f5
tree5ce427920bffe55853603f51e24020409ae6e010
parentd893076525db3d3ef3eb4c69ddbbf4789595bad5
parentedcf39cc377d2de0744412209de4eeb50ca7ed5f
Merge branch 'collectd-5.7'
src/amqp.c
src/bind.c
src/daemon/utils_cache.c
src/utils_format_graphite.c