Merge branch 'collectd-4.0' into collectd-4.1

Conflicts:

	src/rrdtool.c

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

diff --cc src/network.c
index b0f8303,164759b..c81d711
--- 1/src/network.c
--- 2/src/network.c
+++ b/src/network.c
@@@ -1100,20 -1092,8 +1099,18 @@@ static int add_to_buffer (char *buffer
                                        (uint64_t) vl->time))
                        return (-1);
                vl_def->time = vl->time;
-               DEBUG ("network plugin: add_to_buffer: time = %u",
-                               (unsigned int) vl->time);
        }
  
 +      if (vl_def->interval != vl->interval)
 +      {
 +              if (write_part_number (&buffer, &buffer_size, TYPE_INTERVAL,
 +                                      (uint64_t) vl->interval))
 +                      return (-1);
 +              vl_def->interval = vl->interval;
 +              DEBUG ("network plugin: add_to_buffer: interval = %i",
 +                              (int) vl->interval);
 +      }
 +
        if (strcmp (vl_def->plugin, vl->plugin) != 0)
        {
                if (write_part_string (&buffer, &buffer_size, TYPE_PLUGIN,

diff --cc src/processes.c
Simple merge

diff --cc src/rrdtool.c
index 7002dcf,8ad0106..77d8716
--- 1/src/rrdtool.c
--- 2/src/rrdtool.c
+++ b/src/rrdtool.c
@@@ -714,7 -591,10 +714,7 @@@ static void rrd_cache_flush (int timeou
        avl_iterator_t *iter;
        int i;
  
-       DEBUG ("Flushing cache, timeout = %i", timeout);
 -      if (cache == NULL)
 -              return;
 -
+       DEBUG ("rrdtool plugin: Flushing cache, timeout = %i", timeout);
  
        now = time (NULL);
  

diff --cc src/unixsock.c
Simple merge