Merge branch 'collectd-5.6' into collectd-5.7
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Thu, 1 Jun 2017 18:37:49 +0000 (20:37 +0200)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Thu, 1 Jun 2017 18:37:49 +0000 (20:37 +0200)
commitedcf39cc377d2de0744412209de4eeb50ca7ed5f
tree68235324e733ae3e7621150d964c420b8aed0e39
parent5a011cfd81d5ef3876d4ecb43b6bbffd151f1b03
parentfd01cdd0546ccbbda7f4cf5db2d0ae28e1e770cd
Merge branch 'collectd-5.6' into collectd-5.7
src/amqp.c
src/bind.c
src/utils_format_graphite.c