[asterixdb] 07/07: Merge branch 'gerrit/march-hare'

[mb...@apache.org]

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 4a6cb608a5791cdfb44704286a2a568d488097f1
Merge: e74454b b2ae954
Author: Michael Blow <mb...@apache.org>
AuthorDate: Sun Feb 9 14:13:01 2020 -0500

    Merge branch 'gerrit/march-hare'
    
    Change-Id: I477a59907d5d20aa88202c6fb1fa2b8af165e6b9

 .../api/http/server/DiagnosticsApiServlet.java     | 10 +++++--
 .../app/replication/NcLifecycleCoordinator.java    | 22 +++++++++++----
 .../asterix/runtime/ClusterStateManagerTest.java   |  4 +++
 .../common/cluster/IClusterStateManager.java       |  2 --
 .../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/hyracks/hyracks-hdfs/pom.xml     |  2 +-
 .../hyracks/ipc/impl/ReconnectingIPCHandle.java    |  3 +-
 .../java/org/apache/hyracks/util/NetworkUtil.java  | 19 +++++++++++++
 13 files changed, 98 insertions(+), 29 deletions(-)

diff --cc hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/NetworkUtil.java
index 228fd91,3f6e90c..1fcd806
--- a/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/NetworkUtil.java
+++ b/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/NetworkUtil.java
@@@ -27,8 -27,8 +27,9 @@@ import java.net.URISyntaxException
  import java.nio.ByteBuffer;
  import java.nio.channels.SocketChannel;
  import java.util.ArrayList;
 +import java.util.Collections;
  import java.util.List;
+ import java.util.Objects;
  
  import javax.net.ssl.SSLEngine;