Merge branch 'collectd-5.5'

diff --cc src/ceph.c
Simple merge

diff --cc src/ceph_test.c
Simple merge

diff --cc src/cpu.c
Simple merge

diff --cc src/daemon/collectd.c
Simple merge

diff --cc src/daemon/configfile.c
Simple merge

diff --cc src/memcached.c
Simple merge

diff --cc src/ntpd.c
Simple merge

diff --cc src/perl.c
Simple merge

diff --cc src/pinba.c
Simple merge

diff --cc src/postgresql.c
Simple merge

diff --cc src/processes.c
index 63d22fc4f3fbd2860a71577a53974a1c50c332f8,e43720999147abee94cdc006761b253a4b96e75b..fac4778487f3fb0820925433c04267fbb5ee4e5b
--- 1/src/processes.c
--- 2/src/processes.c
+++ b/src/processes.c
@@@ -287,8 -279,8 +287,8 @@@ static void ps_list_register (const cha
                if (status != 0)
                {
                        DEBUG ("ProcessMatch: compiling the regular expression \"%s\" failed.", regexp);
--                      sfree(new->re);
 -                      sfree(new);
++                      sfree (new->re);
 +                      sfree (new);
                        return;
                }
        }

diff --cc src/rrdtool.c
Simple merge

diff --cc src/snmp.c
Simple merge

diff --cc src/table.c
Simple merge

diff --cc src/teamspeak2.c
Simple merge

diff --cc src/threshold.c
Simple merge

diff --cc src/varnish.c
Simple merge

diff --cc src/write_graphite.c
index 0702a6ea9e2888b68104dd6315a399d2275f50e8,a7eef3fb435616ca6093207c385eb8ba90a104a2..6baace14410e48f72761d21d6d2db1c9fdb854ad
--- 1/src/write_graphite.c
--- 2/src/write_graphite.c
+++ b/src/write_graphite.c
@@@ -141,8 -132,10 +141,8 @@@ static int wg_send_buffer (struct wg_ca
      ssize_t status = 0;
  
      status = swrite (cb->sock_fd, cb->send_buf, strlen (cb->send_buf));
-     if (status < 0)
+     if (status != 0)
      {
 -        const char *protocol = cb->protocol ? cb->protocol : WG_DEFAULT_PROTOCOL;
 -
          if (cb->log_send_errors)
          {
              char errbuf[1024];

diff --cc src/zfs_arc.c
Simple merge