Merge branch 'collectd-5.5'

Conflicts:
	src/write_redis.c

diff --cc src/write_redis.c
index 909f51d51aa23ff396da9c259430618efd45043b,2a6f9124aee0f9a66e3c6a004d8456442d7a067b..fa58ad2ace61667322f606a08b380bdb63b7b188
--- 1/src/write_redis.c
--- 2/src/write_redis.c
+++ b/src/write_redis.c
@@@ -141,14 -134,19 +141,21 @@@ static int wr_write (const data_set_t *
    }
  
    rr = redisCommand (node->conn, "ZADD %s %s %s", key, time, value);
-   if (rr==NULL)
+   if (rr == NULL)
      WARNING("ZADD command error. key:%s message:%s", key, node->conn->errstr);
+   else
+     freeReplyObject (rr);
  
 -  rr = redisCommand (node->conn, "SADD collectd/values %s", ident);
+   /* TODO(octo): This is more overhead than necessary. Use the cache and
+    * metadata to determine if it is a new metric and call SADD only once for
+    * each metric. */
 +  rr = redisCommand (node->conn, "SADD %svalues %s",
 +      (node->prefix != NULL) ? node->prefix : REDIS_DEFAULT_PREFIX,
 +      ident);
    if (rr==NULL)
      WARNING("SADD command error. ident:%s message:%s", ident, node->conn->errstr);
+   else
+     freeReplyObject (rr);
  
    pthread_mutex_unlock (&node->lock);