-
Notifications
You must be signed in to change notification settings - Fork 143
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
[Backport 2.13] Manual backport PR with conflict fixes for adding ml_commons version #3319
[Backport 2.13] Manual backport PR with conflict fixes for adding ml_commons version #3319
Conversation
@@ -266,7 +266,7 @@ List<String> jacocoExclusions = [ | |||
'org.opensearch.ml.profile.MLPredictRequestStats', | |||
'org.opensearch.ml.action.deploy.TransportDeployModelAction', | |||
'org.opensearch.ml.action.deploy.TransportDeployModelOnNodeAction', | |||
'org.opensearch.ml.action.undeploy.TransportUndeployModelsAction', | |||
'org.opensearch.ml.action.undeploy.TransportUndeployModelsAction', |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
is it the empty space causing auto backport failure?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nope, there are other conflicts as well. I am cherry-picking a commit from 2.14 to 2.13, the cherry-picked commit has some references to a constant VERSION_2_14 which causes issues in 2.13.
flaky tests are failing:
Please re-run tests! |
…ompatible version (opensearch-project#2486) (opensearch-project#2523) (opensearch-project#3123) * [Feature/multi_tenancy] Remove strict version dependency to compile minimum compatible version (opensearch-project#2485) * Remove strict version dependency to compile minimum compatible version * Only declare version constants once --------- * Remove unnecessary dependency * remove space --------- (cherry picked from commit 954e8b3) Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com> Co-authored-by: Sicheng Song <[email protected]> Signed-off-by: Pavan Yekbote <[email protected]>
Signed-off-by: Pavan Yekbote <[email protected]>
8aef2d7
to
b79e738
Compare
Signed-off-by: Pavan Yekbote <[email protected]>
Description
Backports a commit to 2.13: #3123
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.