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 B8ECF11017 for ; Wed, 14 May 2014 15:11:45 +0000 (UTC) Received: (qmail 84873 invoked by uid 500); 14 May 2014 15:11:45 -0000 Delivered-To: apmail-curator-commits-archive@curator.apache.org Received: (qmail 84821 invoked by uid 500); 14 May 2014 15:11:45 -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 84811 invoked by uid 99); 14 May 2014 15:11:45 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 May 2014 15:11:45 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 22D878C44E6; Wed, 14 May 2014 15:11:45 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: randgalt@apache.org To: commits@curator.apache.org Date: Wed, 14 May 2014 15:11:46 -0000 Message-Id: <265c1e6a1a5940f3be866a1587d8ef9b@git.apache.org> In-Reply-To: <198de5a37df0404d9bf6199f6533c1ae@git.apache.org> References: <198de5a37df0404d9bf6199f6533c1ae@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/6] git commit: Merge branch 'master' into CURATOR-96 Merge branch 'master' into CURATOR-96 Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/568c6997 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/568c6997 Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/568c6997 Branch: refs/heads/master Commit: 568c69979b17b165343228814fc366c001294303 Parents: 426db3d d19aff7 Author: randgalt Authored: Sun Mar 30 13:31:42 2014 -0500 Committer: randgalt Committed: Sun Mar 30 13:31:42 2014 -0500 ---------------------------------------------------------------------- .../curator/framework/recipes/queue/QueueSharder.java | 13 +++++-------- .../framework/recipes/queue/TestQueueSharder.java | 2 +- 2 files changed, 6 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/curator/blob/568c6997/curator-recipes/src/test/java/org/apache/curator/framework/recipes/queue/TestQueueSharder.java ----------------------------------------------------------------------