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 B36B7105F1 for ; Sat, 9 May 2015 22:29:52 +0000 (UTC) Received: (qmail 68164 invoked by uid 500); 9 May 2015 22:29:52 -0000 Delivered-To: apmail-curator-commits-archive@curator.apache.org Received: (qmail 68090 invoked by uid 500); 9 May 2015 22:29:52 -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 67955 invoked by uid 99); 9 May 2015 22:29:52 -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; Sat, 09 May 2015 22:29:52 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0EFC3E1796; Sat, 9 May 2015 22:29:51 +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: Sat, 09 May 2015 22:29:59 -0000 Message-Id: <1afa3e1669e94ee59529a111946df5e0@git.apache.org> In-Reply-To: <558ca9157073476bb4283a5dbf25cb3c@git.apache.org> References: <558ca9157073476bb4283a5dbf25cb3c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [9/9] 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/3016ce2f Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/3016ce2f Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/3016ce2f Branch: refs/heads/CURATOR-3.0 Commit: 3016ce2f49eb90cc01f9e3d41b94594853416965 Parents: 6d5136e 7f20986 Author: randgalt Authored: Sat May 9 10:40:38 2015 -0500 Committer: randgalt Committed: Sat May 9 10:40:38 2015 -0500 ---------------------------------------------------------------------- .../main/java/discovery/InstanceDetails.java | 2 +- .../contexts/GenericDiscoveryContext.java | 8 +-- .../contexts/IntegerDiscoveryContext.java | 4 +- .../server/contexts/StringDiscoveryContext.java | 4 +- .../entity/JsonServiceInstanceMarshaller.java | 6 +- .../entity/JsonServiceInstancesMarshaller.java | 8 +-- .../entity/JsonServiceNamesMarshaller.java | 8 +-- .../discovery/server/rest/DiscoveryContext.java | 4 +- .../server/jetty_jersey/ServiceDetails.java | 4 +- curator-x-discovery/pom.xml | 14 +---- .../curator/x/discovery/ServiceInstance.java | 6 +- .../details/JsonInstanceSerializer.java | 4 +- curator-x-rpc/pom.xml | 8 +++ .../java/org/apache/curator/x/rpc/RpcTests.java | 6 +- pom.xml | 59 ++++++++++++++------ src/site/confluence/compatibility.confluence | 9 +++ src/site/site.xml | 1 + 17 files changed, 95 insertions(+), 60 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/curator/blob/3016ce2f/curator-x-discovery/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/curator/blob/3016ce2f/curator-x-rpc/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/curator/blob/3016ce2f/pom.xml ----------------------------------------------------------------------