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 from 4.1.109.Final to 4.1.110.Final #13807

Merged
merged 1 commit into from
May 24, 2024

Conversation

opensearch-trigger-bot[bot]
Copy link
Contributor

Backport 2700327 from #13802.

Copy link
Contributor

❌ Gradle check result for 5a5663a: 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?

(cherry picked from commit 2700327)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Signed-off-by: Andriy Redko <[email protected]>
@reta reta force-pushed the backport/backport-13802-to-2.x branch from 5a5663a to c8c34f4 Compare May 24, 2024 11:32
Copy link
Contributor

❌ Gradle check result for c8c34f4: 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
Copy link
Collaborator

reta commented May 24, 2024

❌ Gradle check result for c8c34f4: FAILURE

#13792
#10006

Copy link
Contributor

✅ Gradle check result for c8c34f4: SUCCESS

@reta reta merged commit 32fb7ab into 2.x May 24, 2024
26 checks passed
@github-actions github-actions bot deleted the backport/backport-13802-to-2.x branch May 24, 2024 13:28
@reta reta added backport 1.x backport 1.3 Backport to 1.3 branch labels May 24, 2024
@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-13807-to-1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 32fb7ab7fe4ce85609a3a8aecac3697eb6a08561
# Push it to GitHub
git push --set-upstream origin backport/backport-13807-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-13807-to-1.x.

@opensearch-trigger-bot
Copy link
Contributor Author

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

reta pushed a commit to reta/OpenSearch that referenced this pull request May 24, 2024
) (opensearch-project#13807)

(cherry picked from commit 2700327)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Signed-off-by: Andriy Redko <[email protected]>

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
(cherry picked from commit 32fb7ab)
reta pushed a commit to reta/OpenSearch that referenced this pull request May 24, 2024
) (opensearch-project#13807)

(cherry picked from commit 2700327)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Signed-off-by: Andriy Redko <[email protected]>

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
(cherry picked from commit 32fb7ab)
dblock pushed a commit that referenced this pull request May 24, 2024
)

(cherry picked from commit 2700327)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Signed-off-by: Andriy Redko <[email protected]>

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
(cherry picked from commit 32fb7ab)

Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
reta pushed a commit to reta/OpenSearch that referenced this pull request May 24, 2024
) (opensearch-project#13807)

(cherry picked from commit 2700327)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Signed-off-by: Andriy Redko <[email protected]>

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
(cherry picked from commit 32fb7ab)
andrross pushed a commit that referenced this pull request May 24, 2024
)

(cherry picked from commit 2700327)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Signed-off-by: Andriy Redko <[email protected]>

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
(cherry picked from commit 32fb7ab)

Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
kkewwei pushed a commit to kkewwei/OpenSearch that referenced this pull request Jul 24, 2024
) (opensearch-project#13807)

(cherry picked from commit 2700327)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Signed-off-by: Andriy Redko <[email protected]>

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Signed-off-by: kkewwei <[email protected]>
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.

1 participant