Merging upstream version 1.45.3+dfsg.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

30 files changed, 0 insertions, 0 deletions

diff --git a/fluent-bit/conf/fluent-bit-macos.conf b/src/fluent-bit/conf/fluent-bit-macos.conf
index 05da7ee69..05da7ee69 100644
--- a/fluent-bit/conf/fluent-bit-macos.conf
+++ b/src/fluent-bit/conf/fluent-bit-macos.conf
diff --git a/fluent-bit/conf/fluent-bit-metrics.conf b/src/fluent-bit/conf/fluent-bit-metrics.conf
index 988e0dcbb..988e0dcbb 100644
--- a/fluent-bit/conf/fluent-bit-metrics.conf
+++ b/src/fluent-bit/conf/fluent-bit-metrics.conf
diff --git a/fluent-bit/conf/fluent-bit-win32.conf b/src/fluent-bit/conf/fluent-bit-win32.conf
index a27ac5da9..a27ac5da9 100644
--- a/fluent-bit/conf/fluent-bit-win32.conf
+++ b/src/fluent-bit/conf/fluent-bit-win32.conf
diff --git a/fluent-bit/conf/fluent-bit.conf b/src/fluent-bit/conf/fluent-bit.conf
index bf3269f38..bf3269f38 100644
--- a/fluent-bit/conf/fluent-bit.conf
+++ b/src/fluent-bit/conf/fluent-bit.conf
diff --git a/fluent-bit/conf/in_disk.conf b/src/fluent-bit/conf/in_disk.conf
index 55d0b3cd6..55d0b3cd6 100644
--- a/fluent-bit/conf/in_disk.conf
+++ b/src/fluent-bit/conf/in_disk.conf
diff --git a/fluent-bit/conf/in_dummy.conf b/src/fluent-bit/conf/in_dummy.conf
index abdb20690..abdb20690 100644
--- a/fluent-bit/conf/in_dummy.conf
+++ b/src/fluent-bit/conf/in_dummy.conf
diff --git a/fluent-bit/conf/in_forward.conf b/src/fluent-bit/conf/in_forward.conf
index 2b40f2568..2b40f2568 100644
--- a/fluent-bit/conf/in_forward.conf
+++ b/src/fluent-bit/conf/in_forward.conf
diff --git a/fluent-bit/conf/in_head.conf b/src/fluent-bit/conf/in_head.conf
index e3f6ab322..e3f6ab322 100644
--- a/fluent-bit/conf/in_head.conf
+++ b/src/fluent-bit/conf/in_head.conf
diff --git a/fluent-bit/conf/in_mqtt.conf b/src/fluent-bit/conf/in_mqtt.conf
index 3e3bc42e4..3e3bc42e4 100644
--- a/fluent-bit/conf/in_mqtt.conf
+++ b/src/fluent-bit/conf/in_mqtt.conf
diff --git a/fluent-bit/conf/in_netif.conf b/src/fluent-bit/conf/in_netif.conf
index dc1299f97..dc1299f97 100644
--- a/fluent-bit/conf/in_netif.conf
+++ b/src/fluent-bit/conf/in_netif.conf
diff --git a/fluent-bit/conf/in_proc.conf b/src/fluent-bit/conf/in_proc.conf
index f1d742d09..f1d742d09 100644
--- a/fluent-bit/conf/in_proc.conf
+++ b/src/fluent-bit/conf/in_proc.conf
diff --git a/fluent-bit/conf/in_xbee.conf b/src/fluent-bit/conf/in_xbee.conf
index a978ed242..a978ed242 100644
--- a/fluent-bit/conf/in_xbee.conf
+++ b/src/fluent-bit/conf/in_xbee.conf
diff --git a/fluent-bit/conf/kube.conf b/src/fluent-bit/conf/kube.conf
index ab7ef150c..ab7ef150c 100644
--- a/fluent-bit/conf/kube.conf
+++ b/src/fluent-bit/conf/kube.conf
diff --git a/fluent-bit/conf/kube_elasticsearch.conf b/src/fluent-bit/conf/kube_elasticsearch.conf
index 50ca2e102..50ca2e102 100644
--- a/fluent-bit/conf/kube_elasticsearch.conf
+++ b/src/fluent-bit/conf/kube_elasticsearch.conf
diff --git a/fluent-bit/conf/out_file.conf b/src/fluent-bit/conf/out_file.conf
index a6e4cca74..a6e4cca74 100644
--- a/fluent-bit/conf/out_file.conf
+++ b/src/fluent-bit/conf/out_file.conf
diff --git a/fluent-bit/conf/out_flowcounter.conf b/src/fluent-bit/conf/out_flowcounter.conf
index 717688fb8..717688fb8 100644
--- a/fluent-bit/conf/out_flowcounter.conf
+++ b/src/fluent-bit/conf/out_flowcounter.conf
diff --git a/fluent-bit/conf/out_kafka-rest.conf b/src/fluent-bit/conf/out_kafka-rest.conf
index 5582fa641..5582fa641 100644
--- a/fluent-bit/conf/out_kafka-rest.conf
+++ b/src/fluent-bit/conf/out_kafka-rest.conf
diff --git a/fluent-bit/conf/out_td.conf b/src/fluent-bit/conf/out_td.conf
index ab7bdfa6d..ab7bdfa6d 100644
--- a/fluent-bit/conf/out_td.conf
+++ b/src/fluent-bit/conf/out_td.conf
diff --git a/fluent-bit/conf/parser_custom.conf b/src/fluent-bit/conf/parser_custom.conf
index 51e81985e..51e81985e 100644
--- a/fluent-bit/conf/parser_custom.conf
+++ b/src/fluent-bit/conf/parser_custom.conf
diff --git a/fluent-bit/conf/parsers.conf b/src/fluent-bit/conf/parsers.conf
index 71706545d..71706545d 100644
--- a/fluent-bit/conf/parsers.conf
+++ b/src/fluent-bit/conf/parsers.conf
diff --git a/fluent-bit/conf/parsers_ambassador.conf b/src/fluent-bit/conf/parsers_ambassador.conf
index 3ab00d37b..3ab00d37b 100644
--- a/fluent-bit/conf/parsers_ambassador.conf
+++ b/src/fluent-bit/conf/parsers_ambassador.conf
diff --git a/fluent-bit/conf/parsers_cinder.conf b/src/fluent-bit/conf/parsers_cinder.conf
index b67ee99a8..b67ee99a8 100644
--- a/fluent-bit/conf/parsers_cinder.conf
+++ b/src/fluent-bit/conf/parsers_cinder.conf
diff --git a/fluent-bit/conf/parsers_extra.conf b/src/fluent-bit/conf/parsers_extra.conf
index afe48c1ae..afe48c1ae 100644
--- a/fluent-bit/conf/parsers_extra.conf
+++ b/src/fluent-bit/conf/parsers_extra.conf
diff --git a/fluent-bit/conf/parsers_java.conf b/src/fluent-bit/conf/parsers_java.conf
index b03729a0c..b03729a0c 100644
--- a/fluent-bit/conf/parsers_java.conf
+++ b/src/fluent-bit/conf/parsers_java.conf
diff --git a/fluent-bit/conf/parsers_kafka.conf b/src/fluent-bit/conf/parsers_kafka.conf
index db4384a61..db4384a61 100644
--- a/fluent-bit/conf/parsers_kafka.conf
+++ b/src/fluent-bit/conf/parsers_kafka.conf
diff --git a/fluent-bit/conf/parsers_mult.conf b/src/fluent-bit/conf/parsers_mult.conf
index af9025f49..af9025f49 100644
--- a/fluent-bit/conf/parsers_mult.conf
+++ b/src/fluent-bit/conf/parsers_mult.conf
diff --git a/fluent-bit/conf/parsers_multiline.conf b/src/fluent-bit/conf/parsers_multiline.conf
index 8ac34806b..8ac34806b 100644
--- a/fluent-bit/conf/parsers_multiline.conf
+++ b/src/fluent-bit/conf/parsers_multiline.conf
diff --git a/fluent-bit/conf/parsers_openstack.conf b/src/fluent-bit/conf/parsers_openstack.conf
index e1bbc803b..e1bbc803b 100644
--- a/fluent-bit/conf/parsers_openstack.conf
+++ b/src/fluent-bit/conf/parsers_openstack.conf
diff --git a/fluent-bit/conf/plugins.conf b/src/fluent-bit/conf/plugins.conf
index 55c5a8d39..55c5a8d39 100644
--- a/fluent-bit/conf/plugins.conf
+++ b/src/fluent-bit/conf/plugins.conf
diff --git a/fluent-bit/conf/rate_limit.conf b/src/fluent-bit/conf/rate_limit.conf
index 9fdc8311e..9fdc8311e 100644
--- a/fluent-bit/conf/rate_limit.conf
+++ b/src/fluent-bit/conf/rate_limit.conf