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 2022/01/12 13:45:02 UTC
Change in asterixdb[master]: Merge branch 'gerrit/mad-hatter'
From Michael Blow <mb...@apache.org>:
Michael Blow has uploaded this change for review. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/14783 )
Change subject: Merge branch 'gerrit/mad-hatter'
......................................................................
Merge branch 'gerrit/mad-hatter'
Change-Id: I3bc19fae68eba9316d8b750e2c8b296de8677b06
---
M asterixdb/pom.xml
M hyracks-fullstack/pom.xml
3 files changed, 2 insertions(+), 11 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/83/14783/1
diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml
index ae6671a..4a75087 100644
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@ -86,8 +86,7 @@
<hyracks.version>0.3.7-SNAPSHOT</hyracks.version>
<hadoop.version>3.3.1</hadoop.version>
<jacoco.version>0.7.6.201602180812</jacoco.version>
-<<<<<<< HEAD (6c8bd5 [NO ISSUE][COMP] Implement SQL-compat mode for UNION ALL)
- <log4j.version>2.17.0</log4j.version>
+ <log4j.version>2.17.1</log4j.version>
<awsjavasdk.version>2.17.79</awsjavasdk.version>
<parquet.version>1.12.0</parquet.version>
<hadoop-awsjavasdk.version>1.12.109</hadoop-awsjavasdk.version>
@@ -95,10 +94,6 @@
<azuredatalakejavasdk.version>12.7.2</azuredatalakejavasdk.version>
<gcsjavasdk.version>1.114.0</gcsjavasdk.version>
<hadoop-azuresdk.version>8.6.6</hadoop-azuresdk.version>
-=======
- <log4j.version>2.17.1</log4j.version>
- <awsjavasdk.version>2.10.83</awsjavasdk.version>
->>>>>>> BRANCH (77f610 [NO ISSUE] Update log4j2 dependencies 2.17.0 -> 2.17.1)
<implementation.title>Apache AsterixDB - ${project.name}</implementation.title>
<implementation.url>https://asterixdb.apache.org/</implementation.url>
diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml
index 214332e..87124f6 100644
--- a/hyracks-fullstack/pom.xml
+++ b/hyracks-fullstack/pom.xml
@@ -72,13 +72,9 @@
<!-- Versions under dependencymanagement or used in many projects via properties -->
<hadoop.version>3.3.1</hadoop.version>
<jacoco.version>0.7.6.201602180812</jacoco.version>
-<<<<<<< HEAD (6c8bd5 [NO ISSUE][COMP] Implement SQL-compat mode for UNION ALL)
- <log4j.version>2.17.0</log4j.version>
+ <log4j.version>2.17.1</log4j.version>
<snappy.version>1.1.8.4</snappy.version>
<jackson.version>2.13.0</jackson.version>
-=======
- <log4j.version>2.17.1</log4j.version>
->>>>>>> BRANCH (77f610 [NO ISSUE] Update log4j2 dependencies 2.17.0 -> 2.17.1)
<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/+/14783
To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Change-Id: I3bc19fae68eba9316d8b750e2c8b296de8677b06
Gerrit-Change-Number: 14783
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-MessageType: newchange
Change in asterixdb[master]: Merge branch 'gerrit/mad-hatter'
Posted by AsterixDB Code Review <do...@asterix-gerrit.ics.uci.edu>.
From Michael Blow <mb...@apache.org>:
Michael Blow has submitted this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/14783 )
Change subject: Merge branch 'gerrit/mad-hatter'
......................................................................
Merge branch 'gerrit/mad-hatter'
Change-Id: I3bc19fae68eba9316d8b750e2c8b296de8677b06
---
M asterixdb/pom.xml
M hyracks-fullstack/pom.xml
3 files changed, 2 insertions(+), 11 deletions(-)
Approvals:
Jenkins: Verified;
Till Westmann: Looks good to me, approved
diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml
index ae6671a..4a75087 100644
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@ -86,8 +86,7 @@
<hyracks.version>0.3.7-SNAPSHOT</hyracks.version>
<hadoop.version>3.3.1</hadoop.version>
<jacoco.version>0.7.6.201602180812</jacoco.version>
-<<<<<<< HEAD (6c8bd5 [NO ISSUE][COMP] Implement SQL-compat mode for UNION ALL)
- <log4j.version>2.17.0</log4j.version>
+ <log4j.version>2.17.1</log4j.version>
<awsjavasdk.version>2.17.79</awsjavasdk.version>
<parquet.version>1.12.0</parquet.version>
<hadoop-awsjavasdk.version>1.12.109</hadoop-awsjavasdk.version>
@@ -95,10 +94,6 @@
<azuredatalakejavasdk.version>12.7.2</azuredatalakejavasdk.version>
<gcsjavasdk.version>1.114.0</gcsjavasdk.version>
<hadoop-azuresdk.version>8.6.6</hadoop-azuresdk.version>
-=======
- <log4j.version>2.17.1</log4j.version>
- <awsjavasdk.version>2.10.83</awsjavasdk.version>
->>>>>>> BRANCH (77f610 [NO ISSUE] Update log4j2 dependencies 2.17.0 -> 2.17.1)
<implementation.title>Apache AsterixDB - ${project.name}</implementation.title>
<implementation.url>https://asterixdb.apache.org/</implementation.url>
diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml
index 214332e..87124f6 100644
--- a/hyracks-fullstack/pom.xml
+++ b/hyracks-fullstack/pom.xml
@@ -72,13 +72,9 @@
<!-- Versions under dependencymanagement or used in many projects via properties -->
<hadoop.version>3.3.1</hadoop.version>
<jacoco.version>0.7.6.201602180812</jacoco.version>
-<<<<<<< HEAD (6c8bd5 [NO ISSUE][COMP] Implement SQL-compat mode for UNION ALL)
- <log4j.version>2.17.0</log4j.version>
+ <log4j.version>2.17.1</log4j.version>
<snappy.version>1.1.8.4</snappy.version>
<jackson.version>2.13.0</jackson.version>
-=======
- <log4j.version>2.17.1</log4j.version>
->>>>>>> BRANCH (77f610 [NO ISSUE] Update log4j2 dependencies 2.17.0 -> 2.17.1)
<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/+/14783
To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Change-Id: I3bc19fae68eba9316d8b750e2c8b296de8677b06
Gerrit-Change-Number: 14783
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-MessageType: merged
Change in asterixdb[master]: Merge branch 'gerrit/mad-hatter'
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/+/14783 )
Change subject: Merge branch 'gerrit/mad-hatter'
......................................................................
Merge branch 'gerrit/mad-hatter'
Change-Id: I3bc19fae68eba9316d8b750e2c8b296de8677b06
---
M asterixdb/pom.xml
M hyracks-fullstack/pom.xml
3 files changed, 2 insertions(+), 11 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/83/14783/1
diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml
index ae6671a..4a75087 100644
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@ -86,8 +86,7 @@
<hyracks.version>0.3.7-SNAPSHOT</hyracks.version>
<hadoop.version>3.3.1</hadoop.version>
<jacoco.version>0.7.6.201602180812</jacoco.version>
-<<<<<<< HEAD (6c8bd5 [NO ISSUE][COMP] Implement SQL-compat mode for UNION ALL)
- <log4j.version>2.17.0</log4j.version>
+ <log4j.version>2.17.1</log4j.version>
<awsjavasdk.version>2.17.79</awsjavasdk.version>
<parquet.version>1.12.0</parquet.version>
<hadoop-awsjavasdk.version>1.12.109</hadoop-awsjavasdk.version>
@@ -95,10 +94,6 @@
<azuredatalakejavasdk.version>12.7.2</azuredatalakejavasdk.version>
<gcsjavasdk.version>1.114.0</gcsjavasdk.version>
<hadoop-azuresdk.version>8.6.6</hadoop-azuresdk.version>
-=======
- <log4j.version>2.17.1</log4j.version>
- <awsjavasdk.version>2.10.83</awsjavasdk.version>
->>>>>>> BRANCH (77f610 [NO ISSUE] Update log4j2 dependencies 2.17.0 -> 2.17.1)
<implementation.title>Apache AsterixDB - ${project.name}</implementation.title>
<implementation.url>https://asterixdb.apache.org/</implementation.url>
diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml
index 214332e..87124f6 100644
--- a/hyracks-fullstack/pom.xml
+++ b/hyracks-fullstack/pom.xml
@@ -72,13 +72,9 @@
<!-- Versions under dependencymanagement or used in many projects via properties -->
<hadoop.version>3.3.1</hadoop.version>
<jacoco.version>0.7.6.201602180812</jacoco.version>
-<<<<<<< HEAD (6c8bd5 [NO ISSUE][COMP] Implement SQL-compat mode for UNION ALL)
- <log4j.version>2.17.0</log4j.version>
+ <log4j.version>2.17.1</log4j.version>
<snappy.version>1.1.8.4</snappy.version>
<jackson.version>2.13.0</jackson.version>
-=======
- <log4j.version>2.17.1</log4j.version>
->>>>>>> BRANCH (77f610 [NO ISSUE] Update log4j2 dependencies 2.17.0 -> 2.17.1)
<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/+/14783
To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Change-Id: I3bc19fae68eba9316d8b750e2c8b296de8677b06
Gerrit-Change-Number: 14783
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-MessageType: newchange
Change in asterixdb[master]: Merge branch 'gerrit/mad-hatter'
Posted by AsterixDB Code Review <do...@asterix-gerrit.ics.uci.edu>.
From Till Westmann <ti...@apache.org>:
Till Westmann has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/14783 )
Change subject: Merge branch 'gerrit/mad-hatter'
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/14783
To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Change-Id: I3bc19fae68eba9316d8b750e2c8b296de8677b06
Gerrit-Change-Number: 14783
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-Comment-Date: Wed, 12 Jan 2022 17:36:33 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Change in asterixdb[master]: Merge branch 'gerrit/mad-hatter'
Posted by AsterixDB Code Review <do...@asterix-gerrit.ics.uci.edu>.
From Jenkins <je...@fulliautomatix.ics.uci.edu>:
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/14783 )
Change subject: Merge branch 'gerrit/mad-hatter'
......................................................................
Patch Set 1:
Graphix Compatibility Tests Started https://asterix-jenkins.ics.uci.edu/job/graphix-compat/11/
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/14783
To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Change-Id: I3bc19fae68eba9316d8b750e2c8b296de8677b06
Gerrit-Change-Number: 14783
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Comment-Date: Wed, 12 Jan 2022 14:01:06 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Change in asterixdb[master]: Merge branch 'gerrit/mad-hatter'
Posted by AsterixDB Code Review <do...@asterix-gerrit.ics.uci.edu>.
From Michael Blow <mb...@apache.org>:
Michael Blow has removed a vote from this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/14783 )
Change subject: Merge branch 'gerrit/mad-hatter'
......................................................................
Removed Integration-Tests-1 by Jenkins <je...@fulliautomatix.ics.uci.edu>
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/14783
To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Change-Id: I3bc19fae68eba9316d8b750e2c8b296de8677b06
Gerrit-Change-Number: 14783
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-MessageType: deleteVote
Change in asterixdb[master]: Merge branch 'gerrit/mad-hatter'
Posted by AsterixDB Code Review <do...@asterix-gerrit.ics.uci.edu>.
From Jenkins <je...@fulliautomatix.ics.uci.edu>:
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/14783 )
Change subject: Merge branch 'gerrit/mad-hatter'
......................................................................
Patch Set 1: Contrib+1
Graphix Compatibility Tests Successful
https://asterix-jenkins.ics.uci.edu/job/graphix-compat/11/ : SUCCESS
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/14783
To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Change-Id: I3bc19fae68eba9316d8b750e2c8b296de8677b06
Gerrit-Change-Number: 14783
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Comment-Date: Wed, 12 Jan 2022 14:09:50 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Change in asterixdb[master]: Merge branch 'gerrit/mad-hatter'
Posted by AsterixDB Code Review <do...@asterix-gerrit.ics.uci.edu>.
From Jenkins <je...@fulliautomatix.ics.uci.edu>:
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/14783 )
Change subject: Merge branch 'gerrit/mad-hatter'
......................................................................
Patch Set 1: Integration-Tests-1
Integration Tests Failed
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/12865/ : FAILURE
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/14783
To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Change-Id: I3bc19fae68eba9316d8b750e2c8b296de8677b06
Gerrit-Change-Number: 14783
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Comment-Date: Wed, 12 Jan 2022 13:56:14 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment