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 2023/10/14 15:21:53 UTC

[asterixdb] 03/04: Merge branch 'gerrit/neo' into 'gerrit/trinity'

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 603d7c1e9a9948ca5df558ea69f9a3d72e0cbe89
Merge: 22c6d549ae ce631f3284
Author: Michael Blow <mi...@couchbase.com>
AuthorDate: Thu Oct 12 11:11:48 2023 -0400

    Merge branch 'gerrit/neo' into 'gerrit/trinity'
    
    Change-Id: I8d38233ec954b75ae2ee8fd4ba48ea7ec995a28a

 .../appended-resources/supplemental-models.xml     | 90 +++++++++++-----------
 ...com_netty_netty_netty-4.1.100.Final_NOTICE.txt} |  0
 hyracks-fullstack/pom.xml                          |  2 +-
 3 files changed, 46 insertions(+), 46 deletions(-)