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 2017/01/26 17:49:43 UTC
[35/40] curator git commit: Merge branch 'CURATOR-275' of
github.com:joelittlejohn/curator into CURATOR-275
Merge branch 'CURATOR-275' of github.com:joelittlejohn/curator into CURATOR-275
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/8fe1e269
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/8fe1e269
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/8fe1e269
Branch: refs/heads/persistent-watch
Commit: 8fe1e2699feea9efea0029af5f6961b2b67318a3
Parents: 386cade 4776a2d
Author: randgalt <ra...@apache.org>
Authored: Mon Jan 23 20:53:00 2017 -0500
Committer: randgalt <ra...@apache.org>
Committed: Mon Jan 23 20:53:00 2017 -0500
----------------------------------------------------------------------
.../curator/x/discovery/ServiceInstance.java | 17 ++-
.../x/discovery/ServiceInstanceBuilder.java | 9 +-
.../details/EnabledInstanceFilter.java | 33 ++++++
.../discovery/details/ServiceProviderImpl.java | 1 +
.../x/discovery/TestJsonInstanceSerializer.java | 35 ++++--
.../discovery/details/TestServiceProvider.java | 109 +++++++++++++++++++
6 files changed, 191 insertions(+), 13 deletions(-)
----------------------------------------------------------------------