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

Forward port 2.16 release notes #14975

Conversation

andrross
Copy link
Member

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.

@andrross andrross changed the title Forward port 2.16 release notes to main Forward port 2.16 release notes Jul 25, 2024
Signed-off-by: Andrew Ross <andrross@amazon.com>
@andrross andrross force-pushed the forward-port-2.16-release-notes-main branch from 5d44f75 to 3ef0bb8 Compare July 25, 2024 15:08
@andrross andrross added the backport 2.x Backport to 2.x branch label Jul 25, 2024
@andrross andrross merged commit 157d277 into opensearch-project:main Jul 25, 2024
32 of 33 checks passed
@andrross andrross deleted the forward-port-2.16-release-notes-main branch July 25, 2024 16:15
@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:

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

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

andrross added a commit to andrross/OpenSearch that referenced this pull request Jul 25, 2024
Signed-off-by: Andrew Ross <andrross@amazon.com>
(cherry picked from commit 157d277)
andrross added a commit that referenced this pull request Jul 25, 2024
Signed-off-by: Andrew Ross <andrross@amazon.com>
(cherry picked from commit 157d277)
harshavamsi pushed a commit to harshavamsi/OpenSearch that referenced this pull request Aug 20, 2024
Signed-off-by: Andrew Ross <andrross@amazon.com>
wdongyu pushed a commit to wdongyu/OpenSearch that referenced this pull request Aug 22, 2024
Signed-off-by: Andrew Ross <andrross@amazon.com>
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 backport-failed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants