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:20 UTC

[asterixdb] 06/07: Merge branch '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 b2ae95475baf500c8cdfe7184ff6302b2d4038aa
Merge: d37b7f7 8d1e00f
Author: Michael Blow <mb...@apache.org>
AuthorDate: Sun Feb 9 09:07:51 2020 -0500

    Merge branch 'mad-hatter'
    
    Change-Id: Ief0a2fe1f0cc29411eb52b52506a5bc1a2a3fd99

 asterixdb/NOTICE                                   |  2 +-
 .../api/http/server/DiagnosticsApiServlet.java     | 10 +++++--
 .../replication/IReplicationDestination.java       |  4 +--
 .../asterix/common/storage/ReplicaIdentifier.java  | 10 ++++++-
 .../asterix/replication/api/PartitionReplica.java  | 11 +++++++-
 .../replication/api/ReplicationDestination.java    | 32 ++++++++++++++++------
 .../replication/management/ReplicationManager.java |  5 ++--
 .../replication/sync/ReplicaSynchronizer.java      |  3 +-
 hyracks-fullstack/NOTICE                           |  2 +-
 hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml     |  2 +-
 .../hyracks/ipc/impl/ReconnectingIPCHandle.java    |  3 +-
 .../java/org/apache/hyracks/util/NetworkUtil.java  | 19 +++++++++++++
 12 files changed, 80 insertions(+), 23 deletions(-)