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 8107A18D99 for ; Thu, 21 Apr 2016 01:13:01 +0000 (UTC) Received: (qmail 72985 invoked by uid 500); 21 Apr 2016 01:13:01 -0000 Delivered-To: apmail-curator-commits-archive@curator.apache.org Received: (qmail 72897 invoked by uid 500); 21 Apr 2016 01:13:01 -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 72197 invoked by uid 99); 21 Apr 2016 01:13:00 -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; Thu, 21 Apr 2016 01:13:00 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B76C4E0249; Thu, 21 Apr 2016 01:13:00 +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: Thu, 21 Apr 2016 01:13:27 -0000 Message-Id: In-Reply-To: <91adbad286e945d5bd30fef268ec987a@git.apache.org> References: <91adbad286e945d5bd30fef268ec987a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [28/33] curator git commit: Merge branch 'CURATOR-304' of github.com:nirdothan/curator into CURATOR-304 Merge branch 'CURATOR-304' of github.com:nirdothan/curator into CURATOR-304 Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/3d1fca23 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/3d1fca23 Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/3d1fca23 Branch: refs/heads/CURATOR-299 Commit: 3d1fca23108fbb5840e544c3e68d9af2b71de949 Parents: 8499680 0b088ff Author: randgalt Authored: Mon Mar 28 17:38:54 2016 -0500 Committer: randgalt Committed: Mon Mar 28 17:38:54 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(-) ----------------------------------------------------------------------