>From Michael Blow <[email protected]>:
Michael Blow has submitted this change. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18095 )
Change subject: Merge branch 'gerrit/neo' into 'gerrit/trinity'
......................................................................
Merge branch 'gerrit/neo' into 'gerrit/trinity'
Change-Id: Idb6b5126d34da11a358a3ee163623e47bf5051c6
---
M asterixdb/pom.xml
2 files changed, 15 insertions(+), 8 deletions(-)
Approvals:
Michael Blow: Looks good to me, approved; Verified
diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml
index 32c3218..196231d 100644
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@ -90,19 +90,11 @@
<log4j.version>2.22.1</log4j.version>
<awsjavasdk.version>2.17.218</awsjavasdk.version>
<parquet.version>1.12.3</parquet.version>
-<<<<<<< HEAD (261ff9 [NO ISSUE][HYR][LIC] Minor cleanup)
<hadoop-awsjavasdk.version>1.12.572</hadoop-awsjavasdk.version>
- <azureblobjavasdk.version>12.22.0</azureblobjavasdk.version>
- <azurecommonjavasdk.version>12.21.0</azurecommonjavasdk.version>
- <azureidentity.version>1.9.0</azureidentity.version>
- <azuredatalakejavasdk.version>12.7.2</azuredatalakejavasdk.version>
-=======
- <hadoop-awsjavasdk.version>1.12.402</hadoop-awsjavasdk.version>
<azureblobjavasdk.version>12.25.1</azureblobjavasdk.version>
<azurecommonjavasdk.version>12.24.1</azurecommonjavasdk.version>
<azureidentity.version>1.11.1</azureidentity.version>
<azuredatalakejavasdk.version>12.18.1</azuredatalakejavasdk.version>
->>>>>>> BRANCH (21d2ac Merge branch 'gerrit/stabilization-667a908755' into
'gerrit/)
<gcsjavasdk.version>2.26.0</gcsjavasdk.version>
<hadoop-azuresdk.version>8.6.6</hadoop-azuresdk.version>
<hadoop-gcs.version>hadoop3-2.2.6</hadoop-gcs.version>
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18095
To unsubscribe, or for help writing mail filters, visit
https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: trinity
Gerrit-Change-Id: Idb6b5126d34da11a358a3ee163623e47bf5051c6
Gerrit-Change-Number: 18095
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <[email protected]>
Gerrit-Reviewer: Jenkins <[email protected]>
Gerrit-Reviewer: Michael Blow <[email protected]>
Gerrit-MessageType: merged
