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 2020/02/09 21:38:16 UTC

[asterixdb] 02/07: 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 d37b7f766f44a39639dc6fcface8b38376adef5c
Merge: c605728 696fc9a
Author: Michael Blow <mb...@apache.org>
AuthorDate: Tue Feb 4 15:59:16 2020 -0500

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

 .../app/replication/NcLifecycleCoordinator.java    | 22 ++++++++++++++++------
 .../asterix/runtime/ClusterStateManagerTest.java   |  4 ++++
 .../common/cluster/IClusterStateManager.java       |  2 --
 3 files changed, 20 insertions(+), 8 deletions(-)