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/03/06 16:57:51 UTC

[asterixdb] 04/17: 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 40c99b0ea28c250072538700770465799f4aef0c
Merge: dc8efea 604a57e
Author: Michael Blow <mb...@apache.org>
AuthorDate: Sun Feb 28 09:48:14 2021 -0500

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

 asterixdb/asterix-server/pom.xml                         |  4 ++--
 .../src/main/appended-resources/supplemental-models.xml  |  6 +++---
 ...ontent.com_netty_netty_netty-4.1.59.Final_NOTICE.txt} | 16 ++++++++--------
 hyracks-fullstack/pom.xml                                |  2 +-
 4 files changed, 14 insertions(+), 14 deletions(-)