Michael Blow has submitted this change and it was merged. Change subject: Merge commit '7311b03' from stabilization-f69489 ......................................................................
Merge commit '7311b03' from stabilization-f69489 Change-Id: Iecc6e0f4007b36a9ccab31b34103a85d9dcff140 --- M asterixdb/asterix-app/src/test/resources/runtimets/testsuite.xml M asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml M asterixdb/asterix-external-data/pom.xml M asterixdb/pom.xml 4 files changed, 0 insertions(+), 32 deletions(-) Approvals: Anon. E. Moose #1000171: Jenkins: Verified; No violations found; ; Verified Michael Blow: Looks good to me, approved diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite.xml b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite.xml index 199d804..8725af0 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite.xml +++ b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite.xml @@ -1727,21 +1727,6 @@ </compilation-unit> </test-case> </test-group> - <test-group name="hints"> -<<<<<<< HEAD (e39b38 [ASTERIXDB-2463][DOC] add docs for primary index & parallel ) -======= - <test-case FilePath="hints"> - <compilation-unit name="issue_251_dataset_hint_5"> - <output-dir compare="Text">issue_251_dataset_hint_5</output-dir> - </compilation-unit> - </test-case> - <test-case FilePath="hints"> - <compilation-unit name="issue_251_dataset_hint_7"> - <output-dir compare="Text">issue_251_dataset_hint_7</output-dir> - </compilation-unit> - </test-case> ->>>>>>> BRANCH (7311b0 [NO ISSUE] Enable Build/Run w/ Java 11) - </test-group> <test-group name="big-object"> <test-case FilePath="big-object"> <compilation-unit name="big_object_load"> @@ -1786,10 +1771,6 @@ </compilation-unit> </test-case> </test-group> - <test-group name="distinct"> - </test-group> - <test-group name="tinysocial"> - </test-group> <test-group name="types"> <test-case FilePath="types"> <compilation-unit name="domain_boundaries"> @@ -1812,8 +1793,6 @@ <output-dir compare="Clean-JSON">issue-ASTERIXDB-1165</output-dir> </compilation-unit> </test-case> - </test-group> - <test-group name="csv"> </test-group> <test-group name="binary"> <test-case FilePath="binary"> diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml index cb79cd1..56dbfa1 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml +++ b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml @@ -10000,7 +10000,6 @@ </compilation-unit> </test-case> </test-group> -<<<<<<< HEAD (e39b38 [ASTERIXDB-2463][DOC] add docs for primary index & parallel ) <test-group name="meta"> <test-case FilePath="meta"> <compilation-unit name="meta_in_with_clause"> @@ -10013,8 +10012,6 @@ </compilation-unit> </test-case> </test-group> -======= ->>>>>>> BRANCH (7311b0 [NO ISSUE] Enable Build/Run w/ Java 11) <test-group name="big-object"> <test-case FilePath="big-object"> <compilation-unit name="big_object_sort"> diff --git a/asterixdb/asterix-external-data/pom.xml b/asterixdb/asterix-external-data/pom.xml index 5c800b6..935b1c5 100644 --- a/asterixdb/asterix-external-data/pom.xml +++ b/asterixdb/asterix-external-data/pom.xml @@ -429,7 +429,6 @@ <groupId>javax.xml.bind</groupId> <artifactId>jaxb-api</artifactId> </dependency> -<<<<<<< HEAD (e39b38 [ASTERIXDB-2463][DOC] add docs for primary index & parallel ) <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-http</artifactId> @@ -438,7 +437,5 @@ <groupId>io.netty</groupId> <artifactId>netty-all</artifactId> </dependency> -======= ->>>>>>> BRANCH (7311b0 [NO ISSUE] Enable Build/Run w/ Java 11) </dependencies> </project> diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml index b647df0..9bf7533 100644 --- a/asterixdb/pom.xml +++ b/asterixdb/pom.xml @@ -73,13 +73,8 @@ <itest.excludes>${global.itest.excludes}</itest.excludes> <!-- Versions under dependencymanagement or used in many projects via properties --> -<<<<<<< HEAD (e39b38 [ASTERIXDB-2463][DOC] add docs for primary index & parallel ) <algebricks.version>0.3.5-SNAPSHOT</algebricks.version> <hyracks.version>0.3.5-SNAPSHOT</hyracks.version> -======= - <algebricks.version>0.3.4-SNAPSHOT</algebricks.version> - <hyracks.version>0.3.4-SNAPSHOT</hyracks.version> ->>>>>>> BRANCH (7311b0 [NO ISSUE] Enable Build/Run w/ Java 11) <hadoop.version>2.8.5</hadoop.version> <jacoco.version>0.7.6.201602180812</jacoco.version> -- To view, visit https://asterix-gerrit.ics.uci.edu/3039 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iecc6e0f4007b36a9ccab31b34103a85d9dcff140 Gerrit-PatchSet: 4 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow <mb...@apache.org> Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Gerrit-Reviewer: Michael Blow <mb...@apache.org>