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/04 13:07:51 UTC

[asterixdb] 04/04: 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 5f11190aeff273c629ef5def35dc9bb6a6d6ed9c
Merge: cc6e7fd214 8a18d73863
Author: Michael Blow <mi...@couchbase.com>
AuthorDate: Wed Oct 4 08:35:20 2023 -0400

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

 asterixdb/pom.xml                                  |  8 ++-
 .../hyracks/api/application/IServiceContext.java   |  6 ++-
 .../job/IJobSerializerDeserializerContainer.java   | 49 ------------------
 .../job/JobSerializerDeserializerContainer.java    | 58 ----------------------
 .../control/common/application/ServiceContext.java | 10 ++--
 .../control/common/deployment/DeploymentUtils.java | 30 +++++------
 .../hyracks/test/support/LicensingTestBase.java    |  3 +-
 .../hyracks/test/support/TestNCServiceContext.java |  6 ++-
 8 files changed, 36 insertions(+), 134 deletions(-)