Merge branch 'CURATOR-131' of https://github.com/madrob/curator into CURATOR-131
Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/5e1f9416 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/5e1f9416 Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/5e1f9416 Branch: refs/heads/CURATOR-131 Commit: 5e1f9416e125934df98119a1cf958162cdc8c54b Parents: 5398b72 e38d1ce Author: Cam McKenzie <[email protected]> Authored: Mon Aug 11 15:30:17 2014 +1000 Committer: Cam McKenzie <[email protected]> Committed: Mon Aug 11 15:30:17 2014 +1000 ---------------------------------------------------------------------- .../discovery/details/DownInstanceManager.java | 11 ++++++--- .../discovery/details/ServiceDiscoveryImpl.java | 26 +++++++++++++++++--- 2 files changed, 31 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
