>From Ian Maxon <[email protected]>:
Ian Maxon has uploaded this change for review. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17433 )
Change subject: Merge branch 'release-0.9.8-to-neo' into neo
......................................................................
Merge branch 'release-0.9.8-to-neo' into neo
Change-Id: I7caff25b24346ca8e1a7dca7e0fe1fb1dc72f271
---
M asterixdb/pom.xml
2 files changed, 15 insertions(+), 7 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/33/17433/1
diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml
index 39b8682..4fa342c 100644
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@ -82,15 +82,9 @@
<skip-npm-touch.stage>none</skip-npm-touch.stage>
<!-- Versions under dependencymanagement or used in many projects via
properties -->
-<<<<<<< HEAD (1232ae [ASTERIXDB-3136] no selectOp results in 0 cards and 0
costs.)
- <algebricks.version>0.3.8-SNAPSHOT</algebricks.version>
- <hyracks.version>0.3.8-SNAPSHOT</hyracks.version>
- <hadoop.version>3.3.4</hadoop.version>
-=======
<algebricks.version>0.3.8.1-SNAPSHOT</algebricks.version>
<hyracks.version>0.3.8.1-SNAPSHOT</hyracks.version>
- <hadoop.version>3.3.2</hadoop.version>
->>>>>>> BRANCH (f14cb2 Advance versions to 0.9.8.1-SNAPSHOT and
0.3.8.1-SNAPSHOT)
+ <hadoop.version>3.3.4</hadoop.version>
<jacoco.version>0.7.6.201602180812</jacoco.version>
<log4j.version>2.19.0</log4j.version>
<awsjavasdk.version>2.17.218</awsjavasdk.version>
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17433
To unsubscribe, or for help writing mail filters, visit
https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: neo
Gerrit-Change-Id: I7caff25b24346ca8e1a7dca7e0fe1fb1dc72f271
Gerrit-Change-Number: 17433
Gerrit-PatchSet: 1
Gerrit-Owner: Ian Maxon <[email protected]>
Gerrit-MessageType: newchange
