Repository: curator Updated Branches: refs/heads/CURATOR-215 f1e6183e4 -> 8389371b3 (forced update)
Upgrade to ZooKeeper 3.5.0-alpha. Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/227aaf3f Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/227aaf3f Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/227aaf3f Branch: refs/heads/CURATOR-215 Commit: 227aaf3f56dd2e587977f97d10b9b8b20525830a Parents: 7f20986 Author: Ioannis Canellos <ioca...@gmail.com> Authored: Thu Nov 6 16:53:09 2014 +0200 Committer: Scott Blum <dragonsi...@apache.org> Committed: Wed Aug 12 14:24:00 2015 -0400 ---------------------------------------------------------------------- .../framework/recipes/leader/ChaosMonkeyCnxnFactory.java | 7 ------- pom.xml | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/curator/blob/227aaf3f/curator-recipes/src/test/java/org/apache/curator/framework/recipes/leader/ChaosMonkeyCnxnFactory.java ---------------------------------------------------------------------- diff --git a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/leader/ChaosMonkeyCnxnFactory.java b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/leader/ChaosMonkeyCnxnFactory.java index 5f10c5e..ce5b23d 100644 --- a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/leader/ChaosMonkeyCnxnFactory.java +++ b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/leader/ChaosMonkeyCnxnFactory.java @@ -59,13 +59,6 @@ public class ChaosMonkeyCnxnFactory extends NIOServerCnxnFactory super.startup(new ChaosMonkeyZookeeperServer(zks)); } - /** - * Build a connection with a Chaos Monkey ZookeeperServer - */ - protected NIOServerCnxn createConnection(SocketChannel sock, SelectionKey sk) throws IOException - { - return new NIOServerCnxn(zkServer, sock, sk, this); - } public static class ChaosMonkeyZookeeperServer extends ZooKeeperServer { http://git-wip-us.apache.org/repos/asf/curator/blob/227aaf3f/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index f3db843..21eefbf 100644 --- a/pom.xml +++ b/pom.xml @@ -74,7 +74,7 @@ <jetty-version>6.1.26</jetty-version> <scannotation-version>1.0.2</scannotation-version> <resteasy-jaxrs-version>2.3.0.GA</resteasy-jaxrs-version> - <zookeeper-version>3.4.6</zookeeper-version> + <zookeeper-version>3.5.0-alpha</zookeeper-version> <guava-version>16.0.1</guava-version> <testng-version>6.8.8</testng-version> <swift-version>0.12.0</swift-version>
