You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by mb...@apache.org on 2022/01/25 03:41:05 UTC
[asterixdb] 13/13: Merge branch 'gerrit/neo'
This is an automated email from the ASF dual-hosted git repository.
mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 90c4a9389c09d1ce26bd5552e4c28c0302f4bc27
Merge: 017e1f5 f4c503a
Author: Michael Blow <mb...@apache.org>
AuthorDate: Mon Jan 24 20:39:51 2022 -0500
Merge branch 'gerrit/neo'
Change-Id: I3c5e5c46a7b9e7991cb3bfff4b94275902b7ac7c
.../apache/asterix/test/common/TestExecutor.java | 73 ++-
.../asterix-grammar-extension-maven-plugin/pom.xml | 1 -
asterixdb/asterix-runtime/pom.xml | 1 -
asterixdb/asterix-server/pom.xml | 64 ++-
asterixdb/pom.xml | 16 +-
.../appended-resources/supplemental-models.xml | 239 ++++------
...ommons.org_publicdomain_zero_1.0_legalcode.txt} | 0
...e_netty-tcnative-parent-2.0.46.Final_NOTICE.txt | 51 ++
...90750a18d1b99c27c16b1b11d42f16c622_LICENSE.txt} | 0
...2290750a18d1b99c27c16b1b11d42f16c622_NOTICE.txt | 514 +++++++++++++++++++++
....com_Azure_azure-sdk-for-java_master_NOTICE.txt | 159 -------
....com_netty_netty_netty-4.1.73.Final_NOTICE.txt} | 0
...streams_reactive-streams-jvm_v1.0.2_LICENSE.txt | 8 -
hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml | 4 +
hyracks-fullstack/hyracks/hyracks-http/pom.xml | 2 +-
.../license-automation-plugin/pom.xml | 5 +-
.../apache/hyracks/maven/license/ProjectFlag.java | 10 +-
hyracks-fullstack/pom.xml | 50 +-
18 files changed, 786 insertions(+), 411 deletions(-)