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 2023/01/26 01:47:09 UTC
Change in asterixdb[master]: Merge branch 'gerrit/neo'
From Michael Blow <mb...@apache.org>:
Michael Blow has uploaded this change for review. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17323 )
Change subject: Merge branch 'gerrit/neo'
......................................................................
Merge branch 'gerrit/neo'
Change-Id: Icbdf3638df8547973adb3313ce193563a0c0ab0c
---
M hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/GenerateFileMojo.java
2 files changed, 21 insertions(+), 3 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/23/17323/1
diff --git a/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/GenerateFileMojo.java b/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/GenerateFileMojo.java
index 112322b..c548179 100644
--- a/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/GenerateFileMojo.java
+++ b/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/GenerateFileMojo.java
@@ -125,10 +125,7 @@
@Parameter
private boolean includeShadowedDependencies = true;
-<<<<<<< HEAD (7436ac [ASTERIXDB-3098][COMP] Add cost/card to explain string plan)
-=======
->>>>>>> BRANCH (651246 Merge branch 'gerrit/stabilization-667a908755')
@Parameter
private boolean validateShadowLicenses = false;
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17323
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: Icbdf3638df8547973adb3313ce193563a0c0ab0c
Gerrit-Change-Number: 17323
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-MessageType: newchange