]> git.ipfire.org Git - thirdparty/collectd.git/commitdiff
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)
1  2 
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

diff --cc src/bind.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc src/logfile.c
Simple merge
diff --cc src/ntpd.c
Simple merge
diff --cc src/perl.c
Simple merge
diff --cc src/python.c
Simple merge