Merge branch 'CURATOR-175' of https://github.com/gopikori/curator into CURATOR-175
Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/9a487e23 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/9a487e23 Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/9a487e23 Branch: refs/heads/master Commit: 9a487e23b18be80d85188b0d19647883a9007d32 Parents: 3eea676 4190147 Author: randgalt <randg...@apache.org> Authored: Sun Jan 4 19:34:19 2015 -0500 Committer: randgalt <randg...@apache.org> Committed: Sun Jan 4 19:34:19 2015 -0500 ---------------------------------------------------------------------- .../discovery/details/ServiceDiscoveryImpl.java | 8 +++-- .../x/discovery/TestServiceDiscovery.java | 35 ++++++++++++++++++++ 2 files changed, 41 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
