[zookeeper] branch master updated: ZOOKEEPER-3385: fix build break.

[nk...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

nkalmar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/zookeeper.git


The following commit(s) were added to refs/heads/master by this push:
     new 5577d41  ZOOKEEPER-3385: fix build break.
5577d41 is described below

commit 5577d41da48feb8db3595d88a63096594c20fbb9
Author: Michael Han <lh...@twitter.com>
AuthorDate: Wed Jun 5 12:14:51 2019 +0200

    ZOOKEEPER-3385: fix build break.
    
    PR https://github.com/apache/zookeeper/pull/939 that merged in master caused build break due to
    two missing imports. Fix the build break by adding the missing imports.
    
    Author: Michael Han <lh...@twitter.com>
    
    Reviewers: Enrico Olivelli <eo...@apache.org>, Norbert Kalmar <nk...@apache.org>
    
    Closes #967 from hanm/ZOOKEEPER-3385
---
 .../src/main/java/org/apache/zookeeper/server/admin/Commands.java   | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/zookeeper-server/src/main/java/org/apache/zookeeper/server/admin/Commands.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/admin/Commands.java
index 9dd6c74..1c381bf 100644
--- a/zookeeper-server/src/main/java/org/apache/zookeeper/server/admin/Commands.java
+++ b/zookeeper-server/src/main/java/org/apache/zookeeper/server/admin/Commands.java
@@ -35,15 +35,13 @@ import org.apache.zookeeper.Version;
 import org.apache.zookeeper.server.DataTree;
 import org.apache.zookeeper.server.ServerCnxnFactory;
 import org.apache.zookeeper.server.ServerMetrics;
-import org.apache.zookeeper.server.ServerStats;
 import org.apache.zookeeper.server.ZooKeeperServer;
 import org.apache.zookeeper.server.ZooTrace;
 import org.apache.zookeeper.server.persistence.SnapshotInfo;
-import org.apache.zookeeper.server.quorum.Follower;
-import org.apache.zookeeper.server.quorum.FollowerZooKeeperServer;
 import org.apache.zookeeper.server.quorum.Leader;
 import org.apache.zookeeper.server.quorum.LeaderZooKeeperServer;
-import org.apache.zookeeper.server.quorum.ObserverZooKeeperServer;
+import org.apache.zookeeper.server.quorum.QuorumPeer;
+import org.apache.zookeeper.server.quorum.QuorumZooKeeperServer;
 import org.apache.zookeeper.server.quorum.ReadOnlyZooKeeperServer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;