Merge branch 'collectd-5.5'

diff --cc configure.ac
Simple merge

diff --cc src/barometer.c
index c5e7f77b09380acdb31631d3c237cb71fc71013c,84ffdfcb0db74113b8bd18a4ae611df11c858834..d60f5881a7f94e00dd259f89cffcdf994b12eb07
--- 1/src/barometer.c
--- 2/src/barometer.c
+++ b/src/barometer.c
@@@ -473,11 -474,12 +473,11 @@@ static int get_reference_temperature(do
              list = list->next;
              continue;
          }
-             
+ 
          for(i=0; i<REF_TEMP_AVG_NUM*list->num_values; ++i)
          {
 -            DEBUG ("barometer: get_reference_temperature - history %d: %lf",
 -                   i,
 -                   values_history[i]);
 +            DEBUG ("barometer: get_reference_temperature - history %zu: %lf",
 +                   i, values_history[i]);
              if(!isnan(values_history[i]))
              {
                  avg_sum += values_history[i];

diff --cc src/collectd.conf.pod
Simple merge

diff --cc src/zfs_arc.c
Simple merge