-
Notifications
You must be signed in to change notification settings - Fork 100
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[SECURITY] CVE-2023-6378 and CVE-2023-6481 fixes #1792
Conversation
Signed-off-by: Sean Li <[email protected]>
The backport to
To backport manually, run these commands in your terminal: # Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/observability/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/observability/backport-2.x
# Create a new branch
git switch --create backport/backport-1792-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 34f64904519b0f2d57eb3587ccbd1e58dc9a3ebb
# Push it to GitHub
git push --set-upstream origin backport/backport-1792-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/observability/backport-2.x Then, create a pull request where the |
The backport to
To backport manually, run these commands in your terminal: # Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/observability/backport-2.12 2.12
# Navigate to the new working tree
pushd ../.worktrees/observability/backport-2.12
# Create a new branch
git switch --create backport/backport-1792-to-2.12
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 34f64904519b0f2d57eb3587ccbd1e58dc9a3ebb
# Push it to GitHub
git push --set-upstream origin backport/backport-1792-to-2.12
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/observability/backport-2.12 Then, create a pull request where the |
Signed-off-by: Sean Li <[email protected]> (cherry picked from commit 34f6490)
Signed-off-by: Sean Li <[email protected]> (cherry picked from commit 34f6490)
Signed-off-by: Sean Li <[email protected]> (cherry picked from commit 34f6490)
Signed-off-by: Sean Li <[email protected]> (cherry picked from commit 34f6490)
Description
ktlint:0.45.0
contains problematiclogback
libraries, bumpingktlint
to0.47.1
and resolving the breaking linter changes. Duplicate of #1791Issues Resolved
#1780 #1781
Check List
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.