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 2020/05/08 13:16:55 UTC

[asterixdb] 02/06: Merge branch 'gerrit/mad-hatter'

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 2754ab436236386f2aa1d437449397fd294704a3
Merge: 977d93d b5727c6
Author: Michael Blow <mi...@couchbase.com>
AuthorDate: Wed Mar 11 18:34:39 2020 -0400

    Merge branch 'gerrit/mad-hatter'
    
    Change-Id: Iac75fe1fe6640d7da49071220f33597a1464f89e

 asterixdb/asterix-server/pom.xml                   |  4 +-
 asterixdb/pom.xml                                  | 14 +++----
 .../appended-resources/supplemental-models.xml     | 23 +++++------
 ....com_netty_netty_netty-4.1.46.Final_NOTICE.txt} | 11 +++++-
 .../license-automation-plugin/pom.xml              |  4 --
 .../hyracks/hyracks-maven-plugins/pom.xml          |  1 -
 hyracks-fullstack/pom.xml                          | 45 +++++++++++++++++-----
 7 files changed, 66 insertions(+), 36 deletions(-)