Merge branch 'collectd-5.5'

diff --cc src/apcups.c
index 718061a,281bf98..29d58c3
--- 1/src/apcups.c
--- 2/src/apcups.c
+++ b/src/apcups.c
@@@ -162,10 -176,10 +162,10 @@@ static int net_open (char const *node, 
                return (-1);
        }
  
-       DEBUG ("Done opening a socket %i", sd);
+       DEBUG ("apcups plugin: Done opening a socket %i", sd);
  
        return (sd);
 -} /* int net_open (char *host, char *service, int port) */
 +} /* int net_open */
  
  /*
   * Receive a message from the other end. Each message consists of
@@@ -455,10 -480,11 +455,10 @@@ static int apcups_read (void
         */
        if (status != 0)
        {
-               DEBUG ("apc_query_server (%s, %s) = %i",
 -              DEBUG ("apcups plugin: apc_query_server (%s, %i) = %i",
 -                              conf_host == NULL
 -                              ? APCUPS_DEFAULT_HOST
 -                              : conf_host,
 -                              conf_port, status);
++              DEBUG ("apcups plugin: apc_query_server (%s, %s) = %i",
 +                              (conf_node == NULL) ? APCUPS_DEFAULT_NODE : conf_node,
 +                              (conf_service == NULL) ? APCUPS_DEFAULT_SERVICE : conf_service,
 +                              status);
                return (-1);
        }
  

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

diff --cc src/types.db
index 2fd59e5,c605f56..5847218
--- 1/src/types.db
--- 2/src/types.db
+++ b/src/types.db
@@@ -14,7 -14,8 +14,8 @@@ cache_eviction                value:DERIVE:0:
  cache_operation               value:DERIVE:0:U
  cache_ratio           value:GAUGE:0:100
  cache_result          value:DERIVE:0:U
 -cache_size            value:GAUGE:0:U
 +cache_size            value:GAUGE:0:1125899906842623
+ capacity      value:GAUGE:0:U
  ceph_bytes            value:GAUGE:U:U
  ceph_latency  value:GAUGE:U:U
  ceph_rate                     value:DERIVE:0:U