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/08/07 20:33:50 UTC

[asterixdb] 05/05: Merge branch 'gerrit/trinity' into 'master'

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 c994870fa845dea5b726c762e0738b1f152045a8
Merge: 86c153a43c 993ad8c595
Author: Michael Blow <mi...@couchbase.com>
AuthorDate: Mon Aug 7 14:17:58 2023 -0400

    Merge branch 'gerrit/trinity' into 'master'
    
    Change-Id: I8baf3727ddbd74595451eb2d1c3b4f4b274e0757

 .../apache/asterix/metadata/RMIServerFactory.java  |  5 +----
 .../appended-resources/supplemental-models.xml     |  2 +-
 .../org/apache/hyracks/api/util/InvokeUtil.java    | 22 ++++++++++++++++++++
 .../apache/hyracks/util/InterruptibleSupplier.java | 24 ++++++++++++++++++++++
 4 files changed, 48 insertions(+), 5 deletions(-)