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/d2c37d0c Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/d2c37d0c Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/d2c37d0c Branch: refs/heads/CURATOR-131 Commit: d2c37d0ced2cc202c7d4c739e5647733cdf88954 Parents: 6bd0cc3 e38d1ce Author: Cam McKenzie <[email protected]> Authored: Mon Aug 11 16:05:58 2014 +1000 Committer: Cam McKenzie <[email protected]> Committed: Mon Aug 11 16:05:58 2014 +1000 ---------------------------------------------------------------------- .../discovery/details/DownInstanceManager.java | 11 ++++++--- .../discovery/details/ServiceDiscoveryImpl.java | 26 +++++++++++++++++--- 2 files changed, 31 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
