From b5db2c6e5cd2dac006e92d6dd8993d59cab90c51 Mon Sep 17 00:00:00 2001 From: Kentaro Hayashi Date: Fri, 16 Aug 2024 17:20:16 +0900 Subject: [PATCH 1/5] v1.16.6 Signed-off-by: Kentaro Hayashi --- CHANGELOG.md | 16 ++++++++++++++++ lib/fluent/version.rb | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 848a5cb5c9..47c2e628a1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,21 @@ # v1.16 +## Release v1.16.6 - 2024/08/16 + +### Enhancement + +* yaml_parser: Support $log_level element + https://github.com/fluent/fluentd/pull/4486 + +### Bug Fix + +* Fix LoadError with console gem v1.25 + https://github.com/fluent/fluentd/pull/4510 +* out_file: Add warn message for symlink_path setting + https://github.com/fluent/fluentd/pull/4512 +* parser_json: Fix wrong LoadError warning + https://github.com/fluent/fluentd/pull/4592 + ## Release v1.16.5 - 2024/03/27 ### Bug Fix diff --git a/lib/fluent/version.rb b/lib/fluent/version.rb index 140fc43c43..6c6fdd7b24 100644 --- a/lib/fluent/version.rb +++ b/lib/fluent/version.rb @@ -16,6 +16,6 @@ module Fluent - VERSION = '1.16.5' + VERSION = '1.16.6' end From 63adf0d2bbedf493ab1fb23467aea37fe0f0d161 Mon Sep 17 00:00:00 2001 From: Daijiro Fukuda Date: Tue, 20 Aug 2024 13:21:39 +0900 Subject: [PATCH 2/5] v1.16.6: add #4605 Signed-off-by: Daijiro Fukuda --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 47c2e628a1..4ec88005a1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,8 @@ https://github.com/fluent/fluentd/pull/4512 * parser_json: Fix wrong LoadError warning https://github.com/fluent/fluentd/pull/4592 +* `fluentd` command: Fix `--plugin` (`-p`) option not to overwrite default value + https://github.com/fluent/fluentd/pull/4605 ## Release v1.16.5 - 2024/03/27 From cb5e5156372ba2e67ab52e5995b1263de771e224 Mon Sep 17 00:00:00 2001 From: Daijiro Fukuda Date: Tue, 20 Aug 2024 14:29:13 +0900 Subject: [PATCH 3/5] v1.16.6: Move #4510 to Misc Signed-off-by: Daijiro Fukuda --- CHANGELOG.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4ec88005a1..87a4cdb87a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,8 +9,6 @@ ### Bug Fix -* Fix LoadError with console gem v1.25 - https://github.com/fluent/fluentd/pull/4510 * out_file: Add warn message for symlink_path setting https://github.com/fluent/fluentd/pull/4512 * parser_json: Fix wrong LoadError warning @@ -18,6 +16,11 @@ * `fluentd` command: Fix `--plugin` (`-p`) option not to overwrite default value https://github.com/fluent/fluentd/pull/4605 +### Misc + +* Keep console gem v1.23 to avoid LoadError + https://github.com/fluent/fluentd/pull/4510 + ## Release v1.16.5 - 2024/03/27 ### Bug Fix From f12fc954541fa771fcecdaaa5449ebb6bf5e6683 Mon Sep 17 00:00:00 2001 From: Daijiro Fukuda Date: Tue, 20 Aug 2024 14:29:47 +0900 Subject: [PATCH 4/5] v1.16.6: Move #4486 to Bug Fix Signed-off-by: Daijiro Fukuda --- CHANGELOG.md | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 87a4cdb87a..4570fb609b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,13 +2,10 @@ ## Release v1.16.6 - 2024/08/16 -### Enhancement - -* yaml_parser: Support $log_level element - https://github.com/fluent/fluentd/pull/4486 - ### Bug Fix +* YAML config syntax: Fix issue where `$log_level` element was not supported correctly + https://github.com/fluent/fluentd/pull/4486 * out_file: Add warn message for symlink_path setting https://github.com/fluent/fluentd/pull/4512 * parser_json: Fix wrong LoadError warning From f0cc1f0875c79f51166e1118795792f59b62f273 Mon Sep 17 00:00:00 2001 From: Daijiro Fukuda Date: Tue, 20 Aug 2024 16:19:42 +0900 Subject: [PATCH 5/5] v1.16.6: Move #4512 to Misc Because it does not fix the bug itself. Signed-off-by: Daijiro Fukuda --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4570fb609b..0f27ba6a60 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,8 +6,6 @@ * YAML config syntax: Fix issue where `$log_level` element was not supported correctly https://github.com/fluent/fluentd/pull/4486 -* out_file: Add warn message for symlink_path setting - https://github.com/fluent/fluentd/pull/4512 * parser_json: Fix wrong LoadError warning https://github.com/fluent/fluentd/pull/4592 * `fluentd` command: Fix `--plugin` (`-p`) option not to overwrite default value @@ -15,6 +13,8 @@ ### Misc +* out_file: Add warn message for symlink_path setting + https://github.com/fluent/fluentd/pull/4512 * Keep console gem v1.23 to avoid LoadError https://github.com/fluent/fluentd/pull/4510