Fix core package name to address compilation errors#1122
Merged
dhrubo-os merged 1 commit intoopensearch-project:mainfrom Jul 13, 2023
Merged
Conversation
424b311 to
497fe7d
Compare
Signed-off-by: Martin Gaievski <gaievski@amazon.com>
497fe7d to
b7e561f
Compare
Codecov Report
@@ Coverage Diff @@
## main #1122 +/- ##
=========================================
Coverage 84.12% 84.12%
Complexity 1755 1755
=========================================
Files 139 139
Lines 6716 6716
Branches 669 669
=========================================
Hits 5650 5650
Misses 769 769
Partials 297 297
Flags with carried forward coverage won't be shown. Click here to find out more.
|
Merged
2 tasks
b4sjoo
approved these changes
Jul 13, 2023
dhrubo-os
approved these changes
Jul 13, 2023
This was referenced Jul 13, 2023
Contributor
|
Could you please backport this to 2.x? The core refactor was backported yesterday -- opensearch-project/OpenSearch#8782 |
Contributor
|
The backport to 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-1122-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 6bfc1d3a64e225ede879bd9c47527c474b25a8d3
# Push it to GitHub
git push --set-upstream origin backport/backport-1122-to-2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.xThen, create a pull request where the |
Contributor
|
I'm working on backporting this change to 2.x. PR will be up shortly. |
ylwu-amzn
pushed a commit
that referenced
this pull request
Jul 26, 2023
…1157) * Fix core package name to address compilation errors (#1122) Signed-off-by: Martin Gaievski <gaievski@amazon.com> (cherry picked from commit 6bfc1d3) * Empty commit to trigger PR checks. Signed-off-by: Max Ksyunz <max.ksyunz@improving.com> --------- Signed-off-by: Max Ksyunz <max.ksyunz@improving.com> Co-authored-by: Martin Gaievski <gaievski@amazon.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Fix compilation errors after code refactoring PR. Core PR is marked with "backport 2.x", so similar change may be required in 2.x branch as well.
In this PR it's only changing package name of core classes in import section
Noticed in scope of fixing same for neural-search: opensearch-project/neural-search#219
Check List
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.