Merge branch 'collectd-5.5'

diff --cc src/barometer.c
Simple merge

diff --cc src/daemon/collectd.c
index 7b324e1,6e625bb..a745d7d
--- 1/src/daemon/collectd.c
--- 2/src/daemon/collectd.c
+++ b/src/daemon/collectd.c
@@@ -422,9 -423,9 +422,9 @@@ static int pidfile_remove (void
  #endif /* COLLECT_DAEMON */
  
  #ifdef KERNEL_LINUX
- int notify_upstart (void)
+ static int notify_upstart (void)
  {
 -    const char  *upstart_job = getenv("UPSTART_JOB");
 +    char const *upstart_job = getenv("UPSTART_JOB");
  
      if (upstart_job == NULL)
          return 0;
@@@ -442,15 -440,14 +442,15 @@@
      return 1;
  }
  
- int notify_systemd (void)
+ static int notify_systemd (void)
  {
 -    int                  fd = -1;
 -    const char          *notifysocket = getenv("NOTIFY_SOCKET");
 +    int                  fd;
 +    const char          *notifysocket;
      struct sockaddr_un   su;
 -    struct iovec         iov;
 -    struct msghdr        hdr;
 +    size_t               su_size;
 +    char                 buffer[] = "READY=1\n";
  
 +    notifysocket = getenv ("NOTIFY_SOCKET");
      if (notifysocket == NULL)
          return 0;
  

diff --cc src/daemon/plugin.h
Simple merge

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

diff --cc src/redis.c
Simple merge

diff --cc src/write_riemann.c
index 5c59c92,58611a9..6a47ba3
--- 1/src/write_riemann.c
--- 2/src/write_riemann.c
+++ b/src/write_riemann.c
@@@ -26,6 -26,13 +26,12 @@@
   *   Florian octo Forster <octo at collectd.org>
   */
  
 -#include <sys/socket.h>
+ #include <arpa/inet.h>
+ #include <errno.h>
+ #include <netdb.h>
+ #include <inttypes.h>
+ #include <pthread.h>
+ 
  #include "collectd.h"
  #include "plugin.h"
  #include "common.h"

diff --cc src/write_riemann_threshold.c
Simple merge

diff --cc src/write_sensu.c
Simple merge