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 Netty to 4.1.79.Final #3868

Merged
merged 1 commit into from
Jul 13, 2022
Merged

Conversation

reta
Copy link
Collaborator

@reta reta commented Jul 12, 2022

Signed-off-by: Andriy Redko andriy.redko@aiven.io

Description

While we were updating to 4.1.78.Final [1], 4.1.79.Final was released ...

[1] #3855

Issues Resolved

N/A

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Commits are signed per the DCO using --signoff

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.

@reta reta requested a review from a team as a code owner July 12, 2022 20:57
@reta reta added backport 1.x backport 2.x Backport to 2.x branch backport 2.0 Backport to 2.0 branch backport 1.3 Backport to 1.3 branch backport 2.1 >upgrade Label used when upgrading library dependencies (e.g., Lucene) dependencies Pull requests that update a dependency file labels Jul 12, 2022
@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@reta reta merged commit b067d2a into opensearch-project:main Jul 13, 2022
opensearch-trigger-bot bot pushed a commit that referenced this pull request Jul 13, 2022
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
(cherry picked from commit b067d2a)
opensearch-trigger-bot bot pushed a commit that referenced this pull request Jul 13, 2022
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
(cherry picked from commit b067d2a)
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.0 failed:

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

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

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

opensearch-trigger-bot bot pushed a commit that referenced this pull request Jul 13, 2022
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
(cherry picked from commit b067d2a)
opensearch-trigger-bot bot pushed a commit that referenced this pull request Jul 13, 2022
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
(cherry picked from commit b067d2a)
reta added a commit that referenced this pull request Jul 13, 2022
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
(cherry picked from commit b067d2a)

Co-authored-by: Andriy Redko <andriy.redko@aiven.io>
reta added a commit that referenced this pull request Jul 13, 2022
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
(cherry picked from commit b067d2a)

Co-authored-by: Andriy Redko <andriy.redko@aiven.io>
reta added a commit that referenced this pull request Jul 13, 2022
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
(cherry picked from commit b067d2a)

Co-authored-by: Andriy Redko <andriy.redko@aiven.io>
reta added a commit that referenced this pull request Jul 13, 2022
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
(cherry picked from commit b067d2a)

Co-authored-by: Andriy Redko <andriy.redko@aiven.io>
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 2.0 Backport to 2.0 branch backport 2.1 dependencies Pull requests that update a dependency file >upgrade Label used when upgrading library dependencies (e.g., Lucene)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants