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/83636928 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/83636928 Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/83636928 Branch: refs/heads/CURATOR-351 Commit: 8363692841ea46caebd25f7fe8e61b5bc8295bab Parents: 8e7fbac 467513b Author: randgalt <randg...@apache.org> Authored: Mon Jan 23 21:07:23 2017 -0500 Committer: randgalt <randg...@apache.org> Committed: Mon Jan 23 21:07:23 2017 -0500 ---------------------------------------------------------------------- .../curator/x/discovery/ServiceInstance.java | 32 +++++- .../x/discovery/ServiceInstanceBuilder.java | 9 +- .../discovery/details/ServiceProviderImpl.java | 8 ++ .../x/discovery/TestJsonInstanceSerializer.java | 35 ++++-- .../discovery/details/TestServiceProvider.java | 109 +++++++++++++++++++ 5 files changed, 181 insertions(+), 12 deletions(-) ----------------------------------------------------------------------
