Merge branch 'collectd-5.5'
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Thu, 3 Mar 2016 20:36:20 +0000 (21:36 +0100)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Thu, 3 Mar 2016 20:36:20 +0000 (21:36 +0100)
commit6286127470b83578c2889db546cfa32cb0fe0147
tree0b5afb34ab667b3d7d8afacd88b8cfd973b56fbd
parenteb2f3a4bdc78e1e2c4191b4e08d75d5eeea8be0e
parentaedf67e69cbe93a6925fd1004a7c8b990aed4b0a
Merge branch 'collectd-5.5'
src/bind.c
src/daemon/plugin.c
src/daemon/utils_cache.c
src/ntpd.c
src/perl.c
src/python.c