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 EFF2818C6C for ; Wed, 10 Feb 2016 14:29:45 +0000 (UTC) Received: (qmail 99224 invoked by uid 500); 10 Feb 2016 14:29:45 -0000 Delivered-To: apmail-curator-commits-archive@curator.apache.org Received: (qmail 99162 invoked by uid 500); 10 Feb 2016 14:29: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 99095 invoked by uid 99); 10 Feb 2016 14:29:45 -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; Wed, 10 Feb 2016 14:29:45 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 99EB9E0B16; Wed, 10 Feb 2016 14:29: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, 10 Feb 2016 14:29:47 -0000 Message-Id: In-Reply-To: <34d4ad6b6f2441ecb74ce51602319ad9@git.apache.org> References: <34d4ad6b6f2441ecb74ce51602319ad9@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/4] curator git commit: Merge branch 'CURATOR-3.0' of https://git-wip-us.apache.org/repos/asf/curator into CURATOR-3.0 Merge branch 'CURATOR-3.0' of https://git-wip-us.apache.org/repos/asf/curator into CURATOR-3.0 Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/b521b2ef Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/b521b2ef Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/b521b2ef Branch: refs/heads/CURATOR-3.0 Commit: b521b2ef27154e6e091ab7d3e800687881a8f12c Parents: c19d9d7 95bceae Author: randgalt Authored: Wed Feb 10 08:53:57 2016 -0500 Committer: randgalt Committed: Wed Feb 10 08:53:57 2016 -0500 ---------------------------------------------------------------------- .../framework/recipes/cache/TreeCache.java | 3 ++ .../recipes/cache/BaseTestTreeCache.java | 3 +- .../framework/recipes/cache/TestTreeCache.java | 37 +++++++++----------- 3 files changed, 22 insertions(+), 21 deletions(-) ----------------------------------------------------------------------