Merge branch 'CURATOR-176'
Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/8a84f596 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/8a84f596 Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/8a84f596 Branch: refs/heads/master Commit: 8a84f5968a3297f09d31c3a8eb8beca8477b50a5 Parents: f17b46f 11dad79 Author: randgalt <randg...@apache.org> Authored: Mon Jan 12 12:31:00 2015 -0500 Committer: randgalt <randg...@apache.org> Committed: Mon Jan 12 12:31:00 2015 -0500 ---------------------------------------------------------------------- .../discovery/details/ServiceDiscoveryImpl.java | 92 ++++++++++---------- 1 file changed, 48 insertions(+), 44 deletions(-) ----------------------------------------------------------------------
