Merge branch 'collectd-5.7' into collectd-5.8

diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index 2051f3892b749d613f5dcdc6e51ab856a9137783..4efa29e451844123338a70fb4af4fadc2d2c1042 100644 (file)
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -1171,7 +1171,7 @@
 #      <Database bar>
 #              Interval 60
 #              Service "service_name"
-#              Query backend # predefined
+#              Query backends # predefined
 #              Query rt36_tickets
 #      </Database>
 #      <Database qux>

diff --git a/src/collectd.conf.pod b/src/collectd.conf.pod
index 97d184a129028c80cbe72cb3757f20eca715e5c0..0e7a604647106d72704f2f3478fcc2cbc15bce52 100644 (file)
--- a/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@ -6258,7 +6258,7 @@ L<http://www.postgresql.org/docs/manuals/>.
     <Database bar>
       Interval 300
       Service "service_name"
-      Query backend # predefined
+      Query backends # predefined
       Query rt36_tickets
     </Database>
 

diff --git a/src/daemon/meta_data.c b/src/daemon/meta_data.c
index ce3e10206de8a065198d9f53f877d8a0e0f26e85..4d59b7126523cef10357b0b71c29e55c177eaab5 100644 (file)
--- a/src/daemon/meta_data.c
+++ b/src/daemon/meta_data.c
@@ -737,7 +737,6 @@ int meta_data_as_string(meta_data_t *md, /* {{{ */
 
   temp = md_strdup(actual);
   if (temp == NULL) {
-    pthread_mutex_unlock(&md->lock);
     ERROR("meta_data_as_string: md_strdup failed for key `%s'.", key);
     return -ENOMEM;
   }