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] Update to Netty 4.1.115.Final #16666

Merged
merged 1 commit into from
Nov 18, 2024
Merged

Conversation

opensearch-trigger-bot[bot]
Copy link
Contributor

Backport 8e097ee from #16661.

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
(cherry picked from commit 8e097ee)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
@reta reta force-pushed the backport/backport-16661-to-2.x branch from 74c85b5 to 222e27a Compare November 18, 2024 13:51
Copy link
Contributor

❕ Gradle check result for 222e27a: UNSTABLE

  • TEST FAILURES:
      1 org.opensearch.cluster.MinimumClusterManagerNodesIT.testThreeNodesNoClusterManagerBlock

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

@reta reta merged commit 480828e into 2.x Nov 18, 2024
37 checks passed
Copy link

codecov bot commented Nov 18, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 71.86%. Comparing base (407a70d) to head (222e27a).
Report is 1 commits behind head on 2.x.

Additional details and impacted files
@@             Coverage Diff              @@
##                2.x   #16666      +/-   ##
============================================
+ Coverage     71.77%   71.86%   +0.08%     
- Complexity    65404    65420      +16     
============================================
  Files          5314     5314              
  Lines        305210   305210              
  Branches      44473    44473              
============================================
+ Hits         219069   219326     +257     
+ Misses        67908    67598     -310     
- Partials      18233    18286      +53     

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

@github-actions github-actions bot deleted the backport/backport-16661-to-2.x branch November 18, 2024 15:15
@opensearch-trigger-bot
Copy link
Contributor Author

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-16666-to-1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 480828ea4404add8c6bda904453898dd60217b51
# Push it to GitHub
git push --set-upstream origin backport/backport-16666-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-16666-to-1.x.

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 <andriy.redko@aiven.io>
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 <andriy.redko@aiven.io>
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 <andriy.redko@aiven.io>
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 <andriy.redko@aiven.io>
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 <andriy.redko@aiven.io>
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 <andriy.redko@aiven.io>
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 <andriy.redko@aiven.io>
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 <andriy.redko@aiven.io>
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 <andriy.redko@aiven.io>
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 <andriy.redko@aiven.io>
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 <andriy.redko@aiven.io>
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant