Change in asterixdb[mad-hatter]: Merge branch 'gerrit/stabilization-5949a1cb71'

[AsterixDB Code Review <do...@asterix-gerrit.ics.uci.edu>]

From Michael Blow <mb...@apache.org>:

Michael Blow has uploaded this change for review. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17312 )


Change subject: Merge branch 'gerrit/stabilization-5949a1cb71'
......................................................................

Merge branch 'gerrit/stabilization-5949a1cb71'

Change-Id: I8f1e00fb22ec140766e2f9dd6dfaf6b2bfbffa0e
---
M asterixdb/pom.xml
2 files changed, 15 insertions(+), 5 deletions(-)



  git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/12/17312/1

diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml
index e4e278e..2975dc9 100644
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@ -82,12 +82,8 @@
     <hyracks.version>0.3.5-SNAPSHOT</hyracks.version>
     <hadoop.version>2.8.5</hadoop.version>
     <jacoco.version>0.7.6.201602180812</jacoco.version>
-<<<<<<< HEAD   (d7e54c [NO ISSUE] Process shadowed projects w/ license plugin)
-    <log4j.version>2.17.1</log4j.version>
-    <awsjavasdk.version>2.17.218</awsjavasdk.version>
-=======
     <log4j.version>2.19.0</log4j.version>
->>>>>>> BRANCH (2c076a Merge branch 'gerrit/stabilization-f69489')
+    <awsjavasdk.version>2.17.218</awsjavasdk.version>
 
     <implementation.title>Apache AsterixDB - ${project.name}</implementation.title>
     <implementation.url>https://asterixdb.apache.org/</implementation.url>

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17312
To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-Project: asterixdb
Gerrit-Branch: mad-hatter
Gerrit-Change-Id: I8f1e00fb22ec140766e2f9dd6dfaf6b2bfbffa0e
Gerrit-Change-Number: 17312
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-MessageType: newchange