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

Remove mistakenly added code from HybridSearchIT. #1032

Merged
merged 1 commit into from
Dec 18, 2024

Conversation

bzhangam
Copy link
Contributor

@bzhangam bzhangam commented Dec 18, 2024

Description

Remove mistakenly added code from HybridSearchIT. The code was added through this PR but it's not needed.

Related Issues

N/A

Check List

  • New functionality includes testing.
  • New functionality has been documented.
  • API changes companion pull request created.
  • Commits are signed per the DCO using --signoff.
  • Public documentation issue/PR created.

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.

@bzhangam
Copy link
Contributor Author

A manual backport PR will be used to add this change to 2.x.

@martin-gaievski
Copy link
Member

please link the PR where this line has been introduced, you can put it in description

@bzhangam
Copy link
Contributor Author

please link the PR where this line has been introduced, you can put it in description

added

@martin-gaievski martin-gaievski merged commit a759207 into opensearch-project:main Dec 18, 2024
57 of 59 checks passed
@opensearch-trigger-bot
Copy link
Contributor

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

@martin-gaievski martin-gaievski removed the backport 2.x Label will add auto workflow to backport PR to 2.x branch label Dec 18, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants