Skip to content

[Backport 2.x] Bump netty from 4.1.108.Final to 4.1.109.Final#13235

Merged
peternied merged 1 commit into2.xfrom
backport/backport-13233-to-2.x
Apr 16, 2024
Merged

[Backport 2.x] Bump netty from 4.1.108.Final to 4.1.109.Final#13235
peternied merged 1 commit into2.xfrom
backport/backport-13233-to-2.x

Conversation

@opensearch-trigger-bot
Copy link
Copy Markdown
Contributor

Backport 07d447b from #13233.

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
(cherry picked from commit 07d447b)
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-13233-to-2.x branch from a87e07b to f73ae36 Compare April 16, 2024 16:33
@github-actions
Copy link
Copy Markdown
Contributor

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

@github-actions
Copy link
Copy Markdown
Contributor

✅ Gradle check result for f73ae36: SUCCESS

@peternied peternied merged commit 9208739 into 2.x Apr 16, 2024
@peternied peternied deleted the backport/backport-13233-to-2.x branch April 16, 2024 17:52
@opensearch-trigger-bot
Copy link
Copy Markdown
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-13235-to-1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 92087392fb4553a90e0ce0f611dd79dc85e95839
# Push it to GitHub
git push --set-upstream origin backport/backport-13235-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-13235-to-1.x.

reta pushed a commit to reta/OpenSearch that referenced this pull request Apr 16, 2024
) (opensearch-project#13235)

(cherry picked from commit 07d447b)

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 9208739)
reta pushed a commit to reta/OpenSearch that referenced this pull request Apr 16, 2024
) (opensearch-project#13235)

(cherry picked from commit 07d447b)

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 9208739)
reta pushed a commit to reta/OpenSearch that referenced this pull request Apr 16, 2024
) (opensearch-project#13235)

(cherry picked from commit 07d447b)

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 9208739)
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
reta pushed a commit to reta/OpenSearch that referenced this pull request Apr 16, 2024
) (opensearch-project#13235)

(cherry picked from commit 07d447b)

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 9208739)
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
kotwanikunal pushed a commit that referenced this pull request Apr 16, 2024
)

(cherry picked from commit 07d447b)




(cherry picked from commit 9208739)

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>
kotwanikunal pushed a commit that referenced this pull request Apr 16, 2024
)

(cherry picked from commit 07d447b)




(cherry picked from commit 9208739)

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>
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.

2 participants