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

Update to Netty 4.1.115.Final #16661

Merged
merged 1 commit into from
Nov 15, 2024
Merged

Conversation

reta
Copy link
Collaborator

@reta reta commented Nov 15, 2024

Description

Update to Netty 4.1.115.Final

Related Issues

N/A

Check List

  • Functionality includes testing.
  • API changes companion pull request created, if applicable.
  • Public documentation issue/PR created, if applicable.

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.

Signed-off-by: Andriy Redko <[email protected]>
@reta reta added backport 2.x Backport to 2.x branch backport 1.x backport 1.3 Backport to 1.3 branch and removed skip-changelog labels Nov 15, 2024
Copy link
Contributor

❌ Gradle check result for 6ffe319: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

Copy link
Contributor

✅ Gradle check result for 6ffe319: SUCCESS

Copy link

codecov bot commented Nov 15, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 72.04%. Comparing base (3b4fa0e) to head (6ffe319).
Report is 2 commits behind head on main.

Additional details and impacted files
@@             Coverage Diff              @@
##               main   #16661      +/-   ##
============================================
- Coverage     72.11%   72.04%   -0.07%     
- Complexity    65192    65211      +19     
============================================
  Files          5318     5318              
  Lines        303903   303903              
  Branches      43970    43970              
============================================
- Hits         219166   218954     -212     
- Misses        66786    67042     +256     
+ Partials      17951    17907      -44     

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

@reta reta merged commit 8e097ee into opensearch-project:main Nov 15, 2024
49 of 51 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:

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

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

@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

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

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

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

@opensearch-trigger-bot
Copy link
Contributor

The backport to 1.3 failed:

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

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

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

@reta reta added backport 2.x Backport to 2.x branch and removed backport 2.x Backport to 2.x branch labels Nov 18, 2024
opensearch-trigger-bot bot pushed a commit that referenced this pull request Nov 18, 2024
Signed-off-by: Andriy Redko <[email protected]>
(cherry picked from commit 8e097ee)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
reta pushed a commit that referenced this pull request Nov 18, 2024
Signed-off-by: Andriy Redko <[email protected]>
(cherry picked from commit 8e097ee)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Signed-off-by: Andriy Redko <[email protected]>
reta pushed a commit that referenced this pull request Nov 18, 2024
(cherry picked from commit 8e097ee)

Signed-off-by: Andriy Redko <[email protected]>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
reta pushed a commit to reta/OpenSearch that referenced this pull request Nov 18, 2024
…project#16666)

(cherry picked from commit 8e097ee)

Signed-off-by: Andriy Redko <[email protected]>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
(cherry picked from commit 480828e)
Signed-off-by: Andriy Redko <[email protected]>
reta pushed a commit to reta/OpenSearch that referenced this pull request Nov 18, 2024
…project#16666)

(cherry picked from commit 8e097ee)

Signed-off-by: Andriy Redko <[email protected]>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
(cherry picked from commit 480828e)
Signed-off-by: Andriy Redko <[email protected]>
reta pushed a commit to reta/OpenSearch that referenced this pull request Nov 18, 2024
…project#16666)

(cherry picked from commit 8e097ee)

Signed-off-by: Andriy Redko <[email protected]>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
(cherry picked from commit 480828e)
Signed-off-by: Andriy Redko <[email protected]>
reta pushed a commit to reta/OpenSearch that referenced this pull request Nov 18, 2024
…project#16666)

(cherry picked from commit 8e097ee)

Signed-off-by: Andriy Redko <[email protected]>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
(cherry picked from commit 480828e)
Signed-off-by: Andriy Redko <[email protected]>
dblock pushed a commit that referenced this pull request Nov 19, 2024
(cherry picked from commit 8e097ee)




(cherry picked from commit 480828e)

Signed-off-by: Andriy Redko <[email protected]>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
reta added a commit to reta/OpenSearch that referenced this pull request Nov 19, 2024
…project#16666) (opensearch-project#16672)

(cherry picked from commit 8e097ee)

(cherry picked from commit 480828e)

Signed-off-by: Andriy Redko <[email protected]>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
(cherry picked from commit d4a76cd)
dblock pushed a commit that referenced this pull request Nov 19, 2024
(cherry picked from commit 8e097ee)

(cherry picked from commit 480828e)

Signed-off-by: Andriy Redko <[email protected]>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
(cherry picked from commit d4a76cd)
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 backport 2.x Backport to 2.x branch backport-failed dependencies Pull requests that update a dependency file
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants