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 2025/01/05 00:06:01 UTC

(asterixdb) 03/04: Merge branch 'gerrit/trinity' into 'gerrit/goldfish'

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 474bef9c3b90b687d71542d069cbaeee8fee1c7e
Merge: f9bb94e4b2 3e41dbc5eb
Author: Michael Blow <mi...@couchbase.com>
AuthorDate: Fri Jan 3 17:27:34 2025 -0500

    Merge branch 'gerrit/trinity' into 'gerrit/goldfish'
    
    Ext-ref: MB-64542
    Change-Id: Ia187a4426dcd1482cb08baf284762c3124ae3149

 .../hyracks/maven/license/GenerateFileMojo.java     | 14 ++++++++++++--
 .../apache/hyracks/maven/license/LicenseMojo.java   | 21 +++++++++++++++++----
 2 files changed, 29 insertions(+), 6 deletions(-)