curator-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From randg...@apache.org
Subject [5/5] curator git commit: Merge branch 'master' into CURATOR-3.0
Date Mon, 28 Mar 2016 22:40:27 GMT
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/88da05c0
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/88da05c0
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/88da05c0

Branch: refs/heads/CURATOR-3.0
Commit: 88da05c03caffd022737d382fde07271aedda9df
Parents: 062a7d7 3d1fca2
Author: randgalt <randgalt@apache.org>
Authored: Mon Mar 28 17:40:12 2016 -0500
Committer: randgalt <randgalt@apache.org>
Committed: Mon Mar 28 17:40:12 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(-)
----------------------------------------------------------------------



Mime
View raw message