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 6624111945 for ; Wed, 20 Aug 2014 21:14:04 +0000 (UTC) Received: (qmail 68825 invoked by uid 500); 20 Aug 2014 21:14:03 -0000 Delivered-To: apmail-curator-commits-archive@curator.apache.org Received: (qmail 68762 invoked by uid 500); 20 Aug 2014 21:14:03 -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 68746 invoked by uid 99); 20 Aug 2014 21:14:03 -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, 20 Aug 2014 21:14:03 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 2D1AA9827C5; Wed, 20 Aug 2014 21:14:03 +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, 20 Aug 2014 21:14:04 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: Merge branch 'CURATOR-136' of github.com:madrob/curator into CURATOR-136 Merge branch 'CURATOR-136' of github.com:madrob/curator into CURATOR-136 Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/7bec246d Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/7bec246d Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/7bec246d Branch: refs/heads/master Commit: 7bec246de89e06716089c3d36c7b20412eba6985 Parents: e6fc38c 05254af Author: randgalt Authored: Wed Aug 20 16:13:35 2014 -0500 Committer: randgalt Committed: Wed Aug 20 16:13:35 2014 -0500 ---------------------------------------------------------------------- .../src/main/java/org/apache/curator/utils/PathUtils.java | 7 +++++-- .../framework/recipes/atomic/DistributedAtomicValue.java | 4 +++- .../curator/framework/recipes/atomic/PromotedToLock.java | 3 ++- .../framework/recipes/barriers/DistributedBarrier.java | 3 ++- .../framework/recipes/barriers/DistributedDoubleBarrier.java | 3 ++- .../apache/curator/framework/recipes/cache/ChildData.java | 3 ++- .../curator/framework/recipes/cache/GetDataOperation.java | 4 +++- .../apache/curator/framework/recipes/cache/NodeCache.java | 3 ++- .../curator/framework/recipes/cache/PathChildrenCache.java | 3 ++- .../apache/curator/framework/recipes/cache/TreeCache.java | 3 ++- .../apache/curator/framework/recipes/leader/LeaderLatch.java | 5 +++-- .../curator/framework/recipes/leader/LeaderSelector.java | 3 ++- .../apache/curator/framework/recipes/locks/ChildReaper.java | 3 ++- .../framework/recipes/locks/InterProcessMultiLock.java | 1 + .../curator/framework/recipes/locks/InterProcessMutex.java | 3 ++- .../framework/recipes/locks/InterProcessSemaphore.java | 1 + .../framework/recipes/locks/InterProcessSemaphoreV2.java | 2 ++ .../curator/framework/recipes/locks/LockInternals.java | 3 +-- .../curator/framework/recipes/locks/PredicateResults.java | 4 +++- .../framework/recipes/nodes/PersistentEphemeralNode.java | 3 ++- .../curator/framework/recipes/queue/ChildrenCache.java | 3 ++- .../curator/framework/recipes/queue/DistributedQueue.java | 6 +++--- .../apache/curator/framework/recipes/queue/QueueBuilder.java | 5 +++-- .../apache/curator/framework/recipes/queue/QueueSafety.java | 5 +++-- .../framework/recipes/queue/SimpleDistributedQueue.java | 3 ++- .../apache/curator/framework/recipes/shared/SharedValue.java | 3 ++- .../curator/framework/recipes/leader/TestLeaderLatch.java | 8 ++++++++ 27 files changed, 67 insertions(+), 30 deletions(-) ----------------------------------------------------------------------