Skip to content

Commit

Permalink
Backport multiple PRs to 2.x from main (opensearch-project#1662)
Browse files Browse the repository at this point in the history
* add triaging doc (opensearch-project#1250)

Signed-off-by: Yaliang Wu <[email protected]>
Signed-off-by: Bhavana Ramaram <[email protected]>

* Fix missing lombok version compilation failure issue (opensearch-project#1278)

* Fix missing lombok version compilation failure issue

Signed-off-by: zane-neo <[email protected]>
Signed-off-by: Bhavana Ramaram <[email protected]>

* Updated developer guide to include links for getting started with git (opensearch-project#1409)

Signed-off-by: Divit Rawal <[email protected]>
Signed-off-by: Bhavana Ramaram <[email protected]>

* add Austin and Henry as maintainer (opensearch-project#1579)

Signed-off-by: Yaliang Wu <[email protected]>
Signed-off-by: Bhavana Ramaram <[email protected]>

* Apply spotless to ml-algorithms package (opensearch-project#1610)

Signed-off-by: Tyler Ohlsen <[email protected]>
Signed-off-by: Bhavana Ramaram <[email protected]>

* fix format violations

Signed-off-by: Bhavana Ramaram <[email protected]>

---------

Signed-off-by: Yaliang Wu <[email protected]>
Signed-off-by: Bhavana Ramaram <[email protected]>
Signed-off-by: zane-neo <[email protected]>
Signed-off-by: Divit Rawal <[email protected]>
Signed-off-by: Tyler Ohlsen <[email protected]>
Co-authored-by: Yaliang Wu <[email protected]>
Co-authored-by: zane-neo <[email protected]>
Co-authored-by: Divit Rawal <[email protected]>
Co-authored-by: Tyler Ohlsen <[email protected]>
  • Loading branch information
5 people authored and reta committed Jan 12, 2024
1 parent c8456aa commit 7df79e6
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions ml-algorithms/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,10 @@ jacocoTestCoverageVerification {
dependsOn jacocoTestReport
}
check.dependsOn jacocoTestCoverageVerification
<<<<<<< HEAD
compileJava.dependsOn(':opensearch-ml-common:shadowJar')
=======
>>>>>>> 5be107b7 (Backport multiple PRs to 2.x from main (#1662))

spotless {
java {
Expand Down

0 comments on commit 7df79e6

Please sign in to comment.