Closed msfroh closed 11 months ago
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:
# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/opensearch-sdk-java/backport-1.x 1.x
# Navigate to the new working tree
pushd ../.worktrees/opensearch-sdk-java/backport-1.x
# Create a new branch
git switch --create backport/backport-951-to-1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 b6ccc75b988932c37c4452cca5d03583dea7b072
# Push it to GitHub
git push --set-upstream origin backport/backport-951-to-1.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/opensearch-sdk-java/backport-1.x
Then, create a pull request where the base
branch is 1.x
and the compare
/head
branch is backport/backport-951-to-1.x
.
Backport needs to be done manually @msfroh @owaiskazi19
Changes to core added Tracer constructor arg to Netty4Transport.
PR in core: https://github.com/opensearch-project/OpenSearch/pull/10143
Issues Resolved
N/A
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.