Return-Path: X-Original-To: apmail-curator-commits-archive@minotaur.apache.org Delivered-To: apmail-curator-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A96111834C for ; Mon, 17 Aug 2015 16:54:31 +0000 (UTC) Received: (qmail 61836 invoked by uid 500); 17 Aug 2015 16:54:31 -0000 Delivered-To: apmail-curator-commits-archive@curator.apache.org Received: (qmail 61797 invoked by uid 500); 17 Aug 2015 16:54:31 -0000 Mailing-List: contact commits-help@curator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@curator.apache.org Delivered-To: mailing list commits@curator.apache.org Received: (qmail 61787 invoked by uid 99); 17 Aug 2015 16:54:31 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 17 Aug 2015 16:54:31 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6D20BE032D; Mon, 17 Aug 2015 16:54:31 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dragonsinth@apache.org To: commits@curator.apache.org Date: Mon, 17 Aug 2015 16:54:31 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [01/27] curator git commit: Upgrade to ZooKeeper 3.5.0-alpha. 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 Authored: Thu Nov 6 16:53:09 2014 +0200 Committer: Scott Blum 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 @@ 6.1.26 1.0.2 2.3.0.GA - 3.4.6 + 3.5.0-alpha 16.0.1 6.8.8 0.12.0