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 4E48C189D8 for ; Mon, 8 Feb 2016 18:21:35 +0000 (UTC) Received: (qmail 21089 invoked by uid 500); 8 Feb 2016 18:21:35 -0000 Delivered-To: apmail-curator-commits-archive@curator.apache.org Received: (qmail 21058 invoked by uid 500); 8 Feb 2016 18:21:35 -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 21012 invoked by uid 99); 8 Feb 2016 18:21:35 -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; Mon, 08 Feb 2016 18:21:35 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E1077E00A0; Mon, 8 Feb 2016 18:21:34 +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: Mon, 08 Feb 2016 18:21:35 -0000 Message-Id: <3dbacaf02e7f416d9876f690a2bf751e@git.apache.org> In-Reply-To: <5416b1d7afbd412bbe438d875e511b9f@git.apache.org> References: <5416b1d7afbd412bbe438d875e511b9f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] curator git commit: Merge branch 'CURATOR-286' of github.com:joelittlejohn/curator into CURATOR-286 Merge branch 'CURATOR-286' of github.com:joelittlejohn/curator into CURATOR-286 Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/567cac3a Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/567cac3a Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/567cac3a Branch: refs/heads/master Commit: 567cac3a7fc08eec1b3092cbfea5be953830b6e9 Parents: da9f5d0 0823ce6 Author: randgalt Authored: Mon Feb 8 13:21:04 2016 -0500 Committer: randgalt Committed: Mon Feb 8 13:21:04 2016 -0500 ---------------------------------------------------------------------- curator-x-discovery/src/site/confluence/index.confluence | 4 ++++ 1 file changed, 4 insertions(+) ----------------------------------------------------------------------