Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 15223200B4A for ; Wed, 15 Jun 2016 04:11:09 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 13F71160A06; Wed, 15 Jun 2016 02:11:09 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 5BB68160A5F for ; Wed, 15 Jun 2016 04:11:08 +0200 (CEST) Received: (qmail 69688 invoked by uid 500); 15 Jun 2016 02:11:07 -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 69456 invoked by uid 99); 15 Jun 2016 02:11:07 -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, 15 Jun 2016 02:11:07 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id EBD9EE2C1A; Wed, 15 Jun 2016 02:11:06 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: cammckenzie@apache.org To: commits@curator.apache.org Date: Wed, 15 Jun 2016 02:11:10 -0000 Message-Id: In-Reply-To: <4b66f115030d46f8a3e8f0467824c0b9@git.apache.org> References: <4b66f115030d46f8a3e8f0467824c0b9@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [05/19] curator git commit: Merge branch 'CURATOR-331' of https://github.com/julnamoo/curator into CURATOR-331 archived-at: Wed, 15 Jun 2016 02:11:09 -0000 Merge branch 'CURATOR-331' of https://github.com/julnamoo/curator into CURATOR-331 Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/64767734 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/64767734 Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/64767734 Branch: refs/heads/CURATOR-3.0 Commit: 64767734acfa7908f27cb77a61db87ce1dea9372 Parents: 1cc1202 7ae8c2d Author: Cam McKenzie Authored: Wed Jun 15 08:34:49 2016 +1000 Committer: Cam McKenzie Committed: Wed Jun 15 08:34:49 2016 +1000 ---------------------------------------------------------------------- .../framework/recipes/cache/TreeCache.java | 2 +- .../framework/recipes/cache/TestTreeCache.java | 50 ++++++++++++++++++-- 2 files changed, 48 insertions(+), 4 deletions(-) ----------------------------------------------------------------------