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 DD1F311B02 for ; Wed, 18 Jun 2014 16:58:55 +0000 (UTC) Received: (qmail 90261 invoked by uid 500); 18 Jun 2014 16:58:55 -0000 Delivered-To: apmail-curator-commits-archive@curator.apache.org Received: (qmail 90227 invoked by uid 500); 18 Jun 2014 16:58:55 -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 90210 invoked by uid 99); 18 Jun 2014 16:58:55 -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, 18 Jun 2014 16:58:55 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 70C7A83BE5A; Wed, 18 Jun 2014 16:58:55 +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, 18 Jun 2014 16:59:00 -0000 Message-Id: <7916dce508f5406bb5461534f6ea6b9d@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [6/7] git commit: Merge branch 'CURATOR-114' of github.com:cammckenzie/curator into CURATOR-114 Merge branch 'CURATOR-114' of github.com:cammckenzie/curator into CURATOR-114 Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/c885c8fa Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/c885c8fa Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/c885c8fa Branch: refs/heads/master Commit: c885c8fac3ef1c6450dedd173dd1ef6baae826bb Parents: 95893ad 67dbfad Author: randgalt Authored: Wed Jun 18 09:12:58 2014 -0500 Committer: randgalt Committed: Wed Jun 18 09:12:58 2014 -0500 ---------------------------------------------------------------------- .../src/main/java/org/apache/curator/test/TestingServer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------