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

Upgrade com.netflix.nebula:nebula-publishing-plugin to 4.6.0. #5138

Merged
merged 1 commit into from
Nov 8, 2022

Conversation

dblock
Copy link
Member

@dblock dblock commented Nov 8, 2022

Signed-off-by: dblock [email protected]

Description

Upgrade com.netflix.nebula:nebula-publishing-plugin to 4.6.0.
Because this ships in 2.4, skipping CHANGELOG on 2.x.

Issues Resolved

Part of #5121.

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.

@github-actions
Copy link
Contributor

github-actions bot commented Nov 8, 2022

Gradle Check (Jenkins) Run Completed with:

@dblock dblock merged commit 93a7640 into opensearch-project:2.x Nov 8, 2022
@peternied peternied added the backport 2.4 Backport to 2.4 branch label Nov 8, 2022
@opensearch-trigger-bot
Copy link
Contributor

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

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

@peternied
Copy link
Member

@dblock Can you see about getting this backport merged to unblock 2.4 builds?

@dblock dblock deleted the 2.x-nebula branch November 8, 2022 15:40
@dblock
Copy link
Member Author

dblock commented Nov 8, 2022

@mch2 already did this for 2.4 in #5132

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.4 Backport to 2.4 branch skip-changelog
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants