curator-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From randg...@apache.org
Subject [10/10] curator git commit: Merge branch 'CURATOR-3.0' into CURATOR-160
Date Sat, 09 May 2015 15:41:12 GMT
Merge branch 'CURATOR-3.0' into CURATOR-160


Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/ea2873fb
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/ea2873fb
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/ea2873fb

Branch: refs/heads/CURATOR-160
Commit: ea2873fb4cdd8de01a1aaf8b8c45e7e113ad712f
Parents: d361594 3016ce2
Author: randgalt <randgalt@apache.org>
Authored: Sat May 9 10:40:54 2015 -0500
Committer: randgalt <randgalt@apache.org>
Committed: Sat May 9 10:40:54 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(-)
----------------------------------------------------------------------



Mime
View raw message