You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@asterixdb.apache.org by AsterixDB Code Review <do...@asterix-gerrit.ics.uci.edu> on 2021/12/10 14:23:27 UTC
Change in asterixdb[stabilization-5949a1cb71]: Merge branch 'gerrit/stabilization-f69489'
From Michael Blow <mb...@apache.org>:
Michael Blow has uploaded this change for review. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/14444 )
Change subject: Merge branch 'gerrit/stabilization-f69489'
......................................................................
Merge branch 'gerrit/stabilization-f69489'
Change-Id: Ie67b5c38d267d3e8b01e4b0989f688d155311909
---
M hyracks-fullstack/pom.xml
2 files changed, 1 insertion(+), 5 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/44/14444/1
diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml
index 98d7647..4193ca2 100644
--- a/hyracks-fullstack/pom.xml
+++ b/hyracks-fullstack/pom.xml
@@ -71,13 +71,9 @@
<!-- Versions under dependencymanagement or used in many projects via properties -->
<hadoop.version>2.8.5</hadoop.version>
<jacoco.version>0.7.6.201602180812</jacoco.version>
-<<<<<<< HEAD (e8637d [NO ISSUE][MISC] Update dependencies)
- <log4j.version>2.14.1</log4j.version>
+ <log4j.version>2.15.0</log4j.version>
<snappy.version>1.1.8.4</snappy.version>
<jackson.version>2.13.0</jackson.version>
-=======
- <log4j.version>2.15.0</log4j.version>
->>>>>>> BRANCH (641196 [NO ISSUE] Update log4j2 dependencies 2.14.1 -> 2.15.0)
<implementation.title>Apache Hyracks and Algebricks - ${project.name}</implementation.title>
<implementation.url>https://asterixdb.apache.org/</implementation.url>
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/14444
To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: stabilization-5949a1cb71
Gerrit-Change-Id: Ie67b5c38d267d3e8b01e4b0989f688d155311909
Gerrit-Change-Number: 14444
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-MessageType: newchange
Change in asterixdb[stabilization-5949a1cb71]: Merge branch 'gerrit/stabilization-f69489'
Posted by 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/+/14444 )
Change subject: Merge branch 'gerrit/stabilization-f69489'
......................................................................
Merge branch 'gerrit/stabilization-f69489'
Change-Id: Ie67b5c38d267d3e8b01e4b0989f688d155311909
---
M hyracks-fullstack/pom.xml
2 files changed, 1 insertion(+), 5 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/44/14444/1
diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml
index 98d7647..4193ca2 100644
--- a/hyracks-fullstack/pom.xml
+++ b/hyracks-fullstack/pom.xml
@@ -71,13 +71,9 @@
<!-- Versions under dependencymanagement or used in many projects via properties -->
<hadoop.version>2.8.5</hadoop.version>
<jacoco.version>0.7.6.201602180812</jacoco.version>
-<<<<<<< HEAD (e8637d [NO ISSUE][MISC] Update dependencies)
- <log4j.version>2.14.1</log4j.version>
+ <log4j.version>2.15.0</log4j.version>
<snappy.version>1.1.8.4</snappy.version>
<jackson.version>2.13.0</jackson.version>
-=======
- <log4j.version>2.15.0</log4j.version>
->>>>>>> BRANCH (641196 [NO ISSUE] Update log4j2 dependencies 2.14.1 -> 2.15.0)
<implementation.title>Apache Hyracks and Algebricks - ${project.name}</implementation.title>
<implementation.url>https://asterixdb.apache.org/</implementation.url>
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/14444
To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: stabilization-5949a1cb71
Gerrit-Change-Id: Ie67b5c38d267d3e8b01e4b0989f688d155311909
Gerrit-Change-Number: 14444
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-MessageType: newchange