You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@curator.apache.org by ra...@apache.org on 2019/03/03 19:14:18 UTC

[curator] branch master updated (aa5f161 -> e11279d)

This is an automated email from the ASF dual-hosted git repository.

randgalt pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/curator.git.


    from aa5f161  Merge branch 'master' of https://gitbox.apache.org/repos/asf/curator
     add 20cda94  CURATOR-481 Remove jackson-mapper-asl-version and update to latest version of jackson
     add f91064b  CURATOR-481 Remove jackson-mapper-asl-version and update to latest version of jackson Max-Pudov 10/9/2018 3:11 PM
     add e11279d  Merge branch 'CURATOR-481' of github.com:Max-Pudov/curator into CURATOR-481

No new revisions were added by this update.

Summary of changes:
 .../src/main/java/discovery/InstanceDetails.java   |  2 +-
 .../server/contexts/GenericDiscoveryContext.java   |  8 ++++----
 .../server/contexts/IntegerDiscoveryContext.java   |  4 ++--
 .../server/contexts/StringDiscoveryContext.java    |  4 ++--
 .../entity/JsonServiceInstanceMarshaller.java      |  6 +++---
 .../entity/JsonServiceInstancesMarshaller.java     |  8 ++++----
 .../server/entity/JsonServiceNamesMarshaller.java  | 22 +++++++++++-----------
 .../x/discovery/server/rest/DiscoveryContext.java  |  4 ++--
 .../server/jetty_jersey/ServiceDetails.java        |  3 +--
 curator-x-discovery/pom.xml                        |  5 +++--
 .../curator/x/discovery/ServiceInstance.java       |  6 ++----
 .../discovery/details/JsonInstanceSerializer.java  | 12 ++++++------
 .../x/discovery/details/OldServiceInstance.java    |  5 ++---
 .../TestJsonInstanceSerializerCompatibility.java   |  4 ++--
 .../discovery/details/TestNewServiceInstance.java  |  5 ++---
 pom.xml                                            |  8 +-------
 16 files changed, 48 insertions(+), 58 deletions(-)