From 8cf0c5633f789e84952a07bafcd0e97a475290d0 Mon Sep 17 00:00:00 2001 From: Matthew Fala Date: Tue, 11 Apr 2023 19:19:07 +0000 Subject: [PATCH] 2.31.8 CVE - Revert "cherry-picks: add go plugin exit fix" This reverts commit 12a5d1ee2b532c93407d39168c70c43df9b03fa3. Signed-off-by: Matthew Fala --- AWS_FLB_CHERRY_PICKS | 4 ---- CHANGELOG.md | 1 - 2 files changed, 5 deletions(-) diff --git a/AWS_FLB_CHERRY_PICKS b/AWS_FLB_CHERRY_PICKS index 0a1cfc122..17b1606d1 100644 --- a/AWS_FLB_CHERRY_PICKS +++ b/AWS_FLB_CHERRY_PICKS @@ -55,7 +55,3 @@ https://github.com/fluent/fluent-bit.git master 9c72f3ac6510b701277936897cd9701f # CloudWatch Logs options for connecting to CWL test destinations: tls verify and port https://github.com/matthewfala/fluent-bit.git immutable-cwl-net-options 5d9692f00b5295728bf0340d332896a7cc450a7e - -# Go exit fix -https://github.com/PettitWesley/fluent-bit.git go-exit-fix-1_9-one-commit ce5739c20b972320dc485587d56c8b6b21f61934 - diff --git a/CHANGELOG.md b/CHANGELOG.md index be9483981..c3fadc95d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,6 @@ * Enhancement - Add clear info message when chunks are removed because `storage.total_limit_size` is reached [fluent-bit:6719](https://github.com/fluent/fluent-bit/pull/6719) -* Bug - Fix SIGSEGV on shutdown when multiple instances of the same go plugin are configured [aws-for-fluent-bit:613](https://github.com/aws/aws-for-fluent-bit/issues/613) ### 2.31.8