Code

Merge branch 'collectd-5.4' into collectd-5.5
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Thu, 3 Mar 2016 20:32:38 +0000 (21:32 +0100)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Thu, 3 Mar 2016 20:32:38 +0000 (21:32 +0100)
commitaedf67e69cbe93a6925fd1004a7c8b990aed4b0a
tree245c21bd7776c613cee0586ff9d576434d79eac4
parentbb13476e737d6af372256464aa1cf5a5354688fd
parent1eb3c043cb162ef198f86034cf7604be4a0a0d9c
Merge branch 'collectd-5.4' into collectd-5.5
src/bind.c
src/collectdctl.c
src/daemon/plugin.c
src/daemon/utils_cache.c
src/liboconfig/oconfig.c
src/logfile.c
src/ntpd.c
src/perl.c
src/python.c