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 2016/03/29 00:40:26 UTC
[4/5] curator git commit: Merge branch 'CURATOR-304' of
github.com:nirdothan/curator into CURATOR-304
Merge branch 'CURATOR-304' of github.com:nirdothan/curator into CURATOR-304
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/3d1fca23
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/3d1fca23
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/3d1fca23
Branch: refs/heads/CURATOR-3.0
Commit: 3d1fca23108fbb5840e544c3e68d9af2b71de949
Parents: 8499680 0b088ff
Author: randgalt <ra...@apache.org>
Authored: Mon Mar 28 17:38:54 2016 -0500
Committer: randgalt <ra...@apache.org>
Committed: Mon Mar 28 17:38:54 2016 -0500
----------------------------------------------------------------------
.../x/discovery/server/rest/DiscoveryResource.java | 2 +-
.../org/apache/curator/x/discovery/ServiceType.java | 7 ++++++-
.../x/discovery/details/ServiceDiscoveryImpl.java | 13 ++++++++++++-
3 files changed, 19 insertions(+), 3 deletions(-)
----------------------------------------------------------------------