Merge branch 'CURATOR-186'
Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/2347b57d Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/2347b57d Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/2347b57d Branch: refs/heads/CURATOR-160 Commit: 2347b57d526b79680dd340462722f72286661670 Parents: 5f291bb de23cae Author: randgalt <randg...@apache.org> Authored: Tue Apr 21 10:57:31 2015 -0500 Committer: randgalt <randg...@apache.org> Committed: Tue Apr 21 10:57:31 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 ++-- .../java/org/apache/curator/x/rpc/RpcTests.java | 6 +++--- pom.xml | 20 ++++++++++++++++---- 14 files changed, 59 insertions(+), 39 deletions(-) ----------------------------------------------------------------------
