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 1737D1837B for ; Mon, 28 Mar 2016 22:40:24 +0000 (UTC) Received: (qmail 41303 invoked by uid 500); 28 Mar 2016 22:40:24 -0000 Delivered-To: apmail-curator-commits-archive@curator.apache.org Received: (qmail 41269 invoked by uid 500); 28 Mar 2016 22:40:23 -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 41173 invoked by uid 99); 28 Mar 2016 22:40:23 -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, 28 Mar 2016 22:40:23 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B4554E93DB; Mon, 28 Mar 2016 22:40:23 +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, 28 Mar 2016 22:40:27 -0000 Message-Id: <2c80a00480c44c3f8bef92a0245f6084@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [5/5] curator git commit: Merge branch 'master' into CURATOR-3.0 Merge branch 'master' 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/88da05c0 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/88da05c0 Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/88da05c0 Branch: refs/heads/CURATOR-3.0 Commit: 88da05c03caffd022737d382fde07271aedda9df Parents: 062a7d7 3d1fca2 Author: randgalt Authored: Mon Mar 28 17:40:12 2016 -0500 Committer: randgalt Committed: Mon Mar 28 17:40:12 2016 -0500 ---------------------------------------------------------------------- .../x/discovery/server/rest/DiscoveryResource.java | 2 +- .../org/apache/curator/x/discovery/ServiceType.java | 7 ++++++- .../x/discovery/details/ServiceDiscoveryImpl.java | 13 ++++++++++++- 3 files changed, 19 insertions(+), 3 deletions(-) ----------------------------------------------------------------------