Merge branch 'collectd-6.0' into 6/names

author Florian Forster <octo@collectd.org>

Thu, 28 Dec 2023 19:23:33 +0000 (20:23 +0100)

committer GitHub <noreply@github.com>

Thu, 28 Dec 2023 19:23:33 +0000 (20:23 +0100)
author Florian Forster <octo@collectd.org>
Thu, 28 Dec 2023 19:23:33 +0000 (20:23 +0100)
committer GitHub <noreply@github.com>
Thu, 28 Dec 2023 19:23:33 +0000 (20:23 +0100)
diff --cc Makefile.am

index ab7a2086c4ee2d1cb55834c951c8a9a6b267784d,b150b66fe97a75888e5cb1a1dae1f5b7b8ea1c2f..309323e9c3926b965596452f6aa9d6245dfce2a0
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -141,8 -141,8 +141,9 @@@ noinst_LTLIBRARIES = 
         libmetric.la \
         libmount.la \
         liboconfig.la \
-       libstrbuf.la \
+       libresource_metrics.la \
- -      libstrbuf.la
++  libstrbuf.la \
+ +      libutf8.la
   
   
   check_LTLIBRARIES = \
diff --cc src/daemon/metric.c
Simple merge
author	Florian Forster <octo@collectd.org>
	Thu, 28 Dec 2023 19:23:33 +0000 (20:23 +0100)
committer	GitHub <noreply@github.com>
	Thu, 28 Dec 2023 19:23:33 +0000 (20:23 +0100)
		1	2
Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
src/daemon/metric.c	patch \|	diff1 \|	diff2 \|	blob \| history