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 1FF5E174DF for ; Tue, 12 May 2015 22:15:25 +0000 (UTC) Received: (qmail 12283 invoked by uid 500); 12 May 2015 22:15:25 -0000 Delivered-To: apmail-curator-commits-archive@curator.apache.org Received: (qmail 12219 invoked by uid 500); 12 May 2015 22:15:25 -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 12202 invoked by uid 99); 12 May 2015 22:15:25 -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, 12 May 2015 22:15:24 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id CF770E17E1; Tue, 12 May 2015 22:15:24 +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, 12 May 2015 22:15:26 -0000 Message-Id: <10346e25c7064e3b951f2a1782f11c15@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/3] curator git commit: Merge branch 'CURATOR-3.0' into CURATOR-215 Merge branch 'CURATOR-3.0' into CURATOR-215 Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/70c35c67 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/70c35c67 Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/70c35c67 Branch: refs/heads/CURATOR-215 Commit: 70c35c67ee3c951ec001a52d760495bf77e02377 Parents: 72555fa 69b5a65 Author: randgalt Authored: Tue May 12 17:15:18 2015 -0500 Committer: randgalt Committed: Tue May 12 17:15:18 2015 -0500 ---------------------------------------------------------------------- .../apache/curator/framework/imps/CreateBuilderImpl.java | 11 ++++++++--- .../curator/framework/imps/TestFrameworkEdges.java | 1 + 2 files changed, 9 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/curator/blob/70c35c67/curator-framework/src/main/java/org/apache/curator/framework/imps/CreateBuilderImpl.java ----------------------------------------------------------------------