Merge branch 'CURATOR-3.0' into CURATOR-265 Conflicts: curator-framework/src/test/java/org/apache/curator/framework/imps/TestReconfiguration.java
Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/4c3c8377 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/4c3c8377 Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/4c3c8377 Branch: refs/heads/CURATOR-3.0 Commit: 4c3c8377935f8ae2c0f24c4a1010cf4bdef4e297 Parents: 2c0fca8 afa8f7a Author: randgalt <randg...@apache.org> Authored: Fri Sep 25 19:22:10 2015 -0500 Committer: randgalt <randg...@apache.org> Committed: Fri Sep 25 19:22:10 2015 -0500 ---------------------------------------------------------------------- .../curator/framework/imps/TestFramework.java | 4 +- .../recipes/leader/ChaosMonkeyCnxnFactory.java | 24 +- .../recipes/leader/TestLeaderLatch.java | 3 +- .../locks/TestInterProcessMutexBase.java | 6 +- curator-test/pom.xml | 5 - .../apache/curator/test/BaseClassForTests.java | 1 + .../apache/curator/test/ByteCodeRewrite.java | 131 ---------- .../curator/test/QuorumConfigBuilder.java | 36 ++- .../org/apache/curator/test/TestingCluster.java | 5 - .../org/apache/curator/test/TestingServer.java | 5 - .../curator/test/TestingZooKeeperMain.java | 236 ++++++++++++------- .../curator/test/TestingZooKeeperServer.java | 2 + pom.xml | 21 +- 13 files changed, 218 insertions(+), 261 deletions(-) ----------------------------------------------------------------------