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 2021/02/03 16:39:50 UTC

[asterixdb] 07/14: Merge "Merge branch 'gerrit/mad-hatter'" into cheshire-cat

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 0d844d55e4e7a5b12a850d069945fd8d64eb1181
Merge: 69174eb 3a86098
Author: Apache AsterixDB Gerrit <de...@asterixdb.apache.org>
AuthorDate: Thu Jan 28 03:39:32 2021 +0000

    Merge "Merge branch 'gerrit/mad-hatter'" into cheshire-cat

 .../appended-resources/supplemental-models.xml     |  6 ++--
 hyracks-fullstack/pom.xml                          | 35 ++++++++++++++++++----
 2 files changed, 33 insertions(+), 8 deletions(-)