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

Fixed compilation errors after recent changes in core #129

Conversation

martin-gaievski
Copy link
Member

Description

Need to change package names for some core classes, similar to what has been done in knn and other geo-spatial plugins.

Check List

  • All tests pass
  • Commits are signed as per the DCO using --signoff

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.

@martin-gaievski martin-gaievski added the Maintenance Add support for new versions of OpenSearch/Dashboards from upstream label Mar 1, 2023
@martin-gaievski martin-gaievski requested a review from a team March 1, 2023 01:33
Copy link
Member

@vamshin vamshin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! Thanks

Signed-off-by: Martin Gaievski <[email protected]>
@martin-gaievski martin-gaievski force-pushed the fix-compilation-errors-from-core branch from c1159e6 to b9765f7 Compare March 1, 2023 23:21
@navneet1v navneet1v mentioned this pull request Mar 3, 2023
5 tasks
@martin-gaievski martin-gaievski force-pushed the fix-compilation-errors-from-core branch from d270709 to eb8ded5 Compare March 3, 2023 18:25
@martin-gaievski martin-gaievski merged commit 012a9c8 into opensearch-project:main Mar 3, 2023
@naveentatikonda naveentatikonda added the backport 2.x Label will add auto workflow to backport PR to 2.x branch label Mar 28, 2023
@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-129-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 012a9c845d55576175fcade2ff9b6224f819b0da
# Push it to GitHub
git push --set-upstream origin backport/backport-129-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-129-to-2.x.

naveentatikonda pushed a commit to naveentatikonda/neural-search that referenced this pull request Mar 28, 2023
…ject#129)

* Fix compilation errors after recent core changes

Signed-off-by: Martin Gaievski <[email protected]>
naveentatikonda added a commit that referenced this pull request Apr 3, 2023
* Fix compilation errors after recent core changes

Signed-off-by: Martin Gaievski <[email protected]>
Co-authored-by: Martin Gaievski <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x Label will add auto workflow to backport PR to 2.x branch Maintenance Add support for new versions of OpenSearch/Dashboards from upstream
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants