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] [1.x] Update to Netty 4.1.115.Final (#16661) (#16666) #16672

Merged
merged 1 commit into from
Nov 19, 2024

Conversation

reta
Copy link
Collaborator

@reta reta commented Nov 18, 2024

Backport pf #16661 to 1.x

Copy link
Contributor

❌ Gradle check result for 334930e: 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?

@reta reta force-pushed the backport/backport-16666-to-1.x branch from 26d5b28 to 85631e4 Compare November 18, 2024 15:34
…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 reta force-pushed the backport/backport-16666-to-1.x branch from 85631e4 to 036285d Compare November 18, 2024 15:35
Copy link
Contributor

❌ Gradle check result for 26d5b28: ABORTED

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 85631e4: ABORTED

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 036285d: SUCCESS

Copy link

codecov bot commented Nov 18, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Please upload report for BASE (1.x@ad6dff4). Learn more about missing BASE report.
Report is 1 commits behind head on 1.x.

Additional details and impacted files
@@          Coverage Diff           @@
##             1.x   #16672   +/-   ##
======================================
  Coverage       ?   77.54%           
  Complexity     ?    58745           
======================================
  Files          ?     4223           
  Lines          ?   253572           
  Branches       ?    38700           
======================================
  Hits           ?   196637           
  Misses         ?    40911           
  Partials       ?    16024           

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


🚨 Try these New Features:

@reta
Copy link
Collaborator Author

reta commented Nov 18, 2024

@andrross @peternied could you pleas help me here folks? thank you!

@reta
Copy link
Collaborator Author

reta commented Nov 19, 2024

@dblock mind this one as well please?

@dblock dblock merged commit d4a76cd into opensearch-project:1.x Nov 19, 2024
18 of 19 checks passed
@reta reta added the backport 1.3 Backport to 1.3 branch label Nov 19, 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:

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

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.3 Backport to 1.3 branch backport-failed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants