Github user breed commented on a diff in the pull request:
https://github.com/apache/zookeeper/pull/605#discussion_r212781611
--- Diff:
src/java/test/org/apache/zookeeper/server/quorum/QuorumPeerMainTest.java ---
@@ -452,7 +452,7 @@ public void testElectionFraud() throws IOException,
InterruptedException {
Assert.assertTrue("falseLeader never rejoins the quorum",
foundFollowing);
}
- private void waitForOne(ZooKeeper zk, States state) throws
InterruptedException {
--- End diff --
this are in the other change, so we are going to have to re-resolve
depending on which one goes in.
---
