Skip to content

Conversation

@peternied
Copy link
Member

Description

This reverts commit 6f862fa. The feature was missed in the 2.13 release and will be included in 2.14

Issues Resolved

Checklist

  • By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license and subject to the Developers Certificate of Origin.
    For more information on following Developer Certificate of Origin and signing off your commits, please check here.

…arch-project#6634)"

This reverts commit 6f862fa.

Signed-off-by: Peter Nied <petern@amazon.com>
@hdhalter hdhalter added the backport 2.13 PR: Backport label for 2.13 label Apr 15, 2024
@hdhalter hdhalter merged commit 95495f7 into opensearch-project:2.13 Apr 15, 2024
@opensearch-trigger-bot
Copy link
Contributor

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

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

@peternied peternied deleted the revert-unreleased-feature branch April 15, 2024 21:40
@peternied
Copy link
Member Author

the backport to 2.13 failed

This change targeted the 2.13 branch, so no backport is needed since this will be out in the next release.

@hdhalter
Copy link
Contributor

the backport to 2.13 failed

This change targeted the 2.13 branch, so no backport is needed since this will be out in the next release.

Did we not previously merge it into 2.13?

@hdhalter
Copy link
Contributor

the backport to 2.13 failed

This change targeted the 2.13 branch, so no backport is needed since this will be out in the next release.

Did we not previously merge it into 2.13?

I see, you reverted the original PR. No need to backport. :)

@hdhalter hdhalter removed the backport 2.13 PR: Backport label for 2.13 label Apr 15, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants