Skip to content
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

[Backport] [2.x] Bump Netty to 4.1.114.Final (#16182) #16184

Merged

Conversation

reta
Copy link
Collaborator

@reta reta commented Oct 3, 2024

Backport of #16182 of 2.x

Signed-off-by: Andriy Redko <[email protected]>
(cherry picked from commit 3d7184b)
Copy link
Contributor

github-actions bot commented Oct 3, 2024

❕ Gradle check result for b4ffa84: UNSTABLE

Please review all flaky tests that succeeded after retry and create an issue if one does not already exist to track the flaky failure.

Copy link

codecov bot commented Oct 3, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 71.73%. Comparing base (a12e3e6) to head (b4ffa84).
Report is 45 commits behind head on 2.x.

Additional details and impacted files
@@             Coverage Diff              @@
##                2.x   #16184      +/-   ##
============================================
- Coverage     71.75%   71.73%   -0.02%     
- Complexity    64708    64815     +107     
============================================
  Files          5278     5279       +1     
  Lines        302570   302964     +394     
  Branches      44013    44072      +59     
============================================
+ Hits         217098   217328     +230     
- Misses        67315    67508     +193     
+ Partials      18157    18128      -29     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@reta
Copy link
Collaborator Author

reta commented Oct 4, 2024

@peternied mind approving this one as well? thank you

@peternied peternied merged commit f44ce4c into opensearch-project:2.x Oct 4, 2024
57 checks passed
@opensearch-trigger-bot
Copy link
Contributor

The backport to 1.x failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/backport-1.x 1.x
# Navigate to the new working tree
pushd ../.worktrees/backport-1.x
# Create a new branch
git switch --create backport/backport-16184-to-1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 f44ce4cbd119b2672a1385aa89dab7dc7dd6f9bc
# Push it to GitHub
git push --set-upstream origin backport/backport-16184-to-1.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/backport-1.x

Then, create a pull request where the base branch is 1.x and the compare/head branch is backport/backport-16184-to-1.x.

@reta reta added the backport 1.3 Backport to 1.3 branch label Oct 4, 2024
@opensearch-trigger-bot
Copy link
Contributor

The backport to 1.3 failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/backport-1.3 1.3
# Navigate to the new working tree
pushd ../.worktrees/backport-1.3
# Create a new branch
git switch --create backport/backport-16184-to-1.3
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 f44ce4cbd119b2672a1385aa89dab7dc7dd6f9bc
# Push it to GitHub
git push --set-upstream origin backport/backport-16184-to-1.3
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/backport-1.3

Then, create a pull request where the base branch is 1.3 and the compare/head branch is backport/backport-16184-to-1.3.

reta added a commit to reta/OpenSearch that referenced this pull request Oct 7, 2024
reta added a commit to reta/OpenSearch that referenced this pull request Oct 7, 2024
reta added a commit to reta/OpenSearch that referenced this pull request Oct 7, 2024
reta added a commit to reta/OpenSearch that referenced this pull request Oct 7, 2024
reta added a commit to reta/OpenSearch that referenced this pull request Oct 7, 2024
peternied pushed a commit that referenced this pull request Oct 7, 2024
reta added a commit that referenced this pull request Oct 7, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 1.x backport 1.3 Backport to 1.3 branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants