Merge branch 'CURATOR-186' of https://github.com/xoom/curator into CURATOR-186
Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/de23cae9 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/de23cae9 Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/de23cae9 Branch: refs/heads/master Commit: de23cae9e5dcb2681f2a0934c2fbb8fd7570ff0b Parents: 6a56c51 4bd2c0b Author: randgalt <[email protected]> Authored: Wed Apr 1 17:22:35 2015 -0500 Committer: randgalt <[email protected]> Committed: Wed Apr 1 17:22:35 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(-) ----------------------------------------------------------------------
