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 reactor_netty from 1.1.26 to 1.1.27 (#17322) #17346

Merged
merged 1 commit into from
Feb 13, 2025

Conversation

reta
Copy link
Collaborator

@reta reta commented Feb 13, 2025

Backport of #17322 to 2.x

Signed-off-by: Andriy Redko <drreta@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
(cherry picked from commit 5feb514)
Signed-off-by: Andriy Redko <drreta@gmail.com>
Copy link
Contributor

✅ Gradle check result for 534c35c: SUCCESS

Copy link

codecov bot commented Feb 13, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 71.93%. Comparing base (919076a) to head (534c35c).
Report is 6 commits behind head on 2.x.

Additional details and impacted files
@@             Coverage Diff              @@
##                2.x   #17346      +/-   ##
============================================
+ Coverage     71.90%   71.93%   +0.02%     
- Complexity    65908    65954      +46     
============================================
  Files          5341     5341              
  Lines        307160   307147      -13     
  Branches      44824    44825       +1     
============================================
+ Hits         220872   220944      +72     
+ Misses        67871    67775      -96     
- Partials      18417    18428      +11     

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

@reta reta merged commit 63eb4ed into opensearch-project:2.x Feb 13, 2025
70 checks passed
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.19.1 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-2.19.1 2.19.1
# Navigate to the new working tree
pushd ../.worktrees/backport-2.19.1
# Create a new branch
git switch --create backport/backport-17346-to-2.19.1
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 63eb4ed4b3199f42bbcb9ec7c088afb1e99e7fac
# Push it to GitHub
git push --set-upstream origin backport/backport-17346-to-2.19.1
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/backport-2.19.1

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants