Repository: curator Updated Branches: refs/heads/CURATOR-3.0 44ee8547e -> 7d972593a
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/034e910a Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/034e910a Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/034e910a Branch: refs/heads/CURATOR-3.0 Commit: 034e910a907fa89e1c0cd3373fa3bf8ee7759ae6 Parents: ef2ca57 Author: Ioannis Canellos <[email protected]> Authored: Thu Nov 6 16:53:09 2014 +0200 Committer: Ioannis Canellos <[email protected]> Committed: Thu Nov 6 16:56:00 2014 +0200 ---------------------------------------------------------------------- .../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/034e910a/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/034e910a/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 6dd5d14..7b94d03 100644 --- a/pom.xml +++ b/pom.xml @@ -82,7 +82,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>
