Skip to content

Conversation

@jainankitk
Copy link
Contributor

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.

Signed-off-by: Ankit Jain <akjain@amazon.com>
Signed-off-by: Ankit Jain <akjain@amazon.com>
@rishabh6788 rishabh6788 merged commit 95ff23f into opensearch-project:2.19 Feb 7, 2025
43 checks passed
@reta reta added the backport 2.x Backport to 2.x branch label Feb 7, 2025
@opensearch-trigger-bot
Copy link
Contributor

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

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-17300-to-2.x.

@reta
Copy link
Contributor

reta commented Feb 7, 2025

@jainankitk would you mind please to forward to 2.x and main? Thank you.

@jainankitk jainankitk deleted the release-notes-2.19 branch February 7, 2025 21:14
@jainankitk
Copy link
Contributor Author

2.x: #17302

@jainankitk
Copy link
Contributor Author

main: #17317

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport 2.x Backport to 2.x branch

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants