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 B4B5E18E1A for ; Tue, 1 Sep 2015 13:28:52 +0000 (UTC) Received: (qmail 31528 invoked by uid 500); 1 Sep 2015 13:27:54 -0000 Delivered-To: apmail-curator-commits-archive@curator.apache.org Received: (qmail 31340 invoked by uid 500); 1 Sep 2015 13:27:54 -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 30684 invoked by uid 99); 1 Sep 2015 13:27:53 -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; Tue, 01 Sep 2015 13:27:53 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8B86CE0615; Tue, 1 Sep 2015 13:27:53 +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: Tue, 01 Sep 2015 13:28:05 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [13/45] curator git commit: Merge remote-tracking branch 'origin/CURATOR-3.0' into CURATOR-214 Merge remote-tracking branch 'origin/CURATOR-3.0' into CURATOR-214 Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/ba4b5d8c Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/ba4b5d8c Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/ba4b5d8c Branch: refs/heads/CURATOR-248 Commit: ba4b5d8cb1f9733d3901b0b619528454d3dbf8c8 Parents: af369de 2fc9e37 Author: Cam McKenzie Authored: Sun Aug 23 09:35:05 2015 +1000 Committer: Cam McKenzie Committed: Sun Aug 23 09:35:05 2015 +1000 ---------------------------------------------------------------------- .../recipes/queue/DistributedIdQueue.java | 28 +++++++++++++++++++- .../recipes/queue/DistributedQueue.java | 7 ++++- .../recipes/queue/TestDistributedIdQueue.java | 2 +- .../recipes/queue/TestDistributedQueue.java | 2 +- 4 files changed, 35 insertions(+), 4 deletions(-) ----------------------------------------------------------------------