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/60d24c2c Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/60d24c2c Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/60d24c2c Branch: refs/heads/CURATOR-3.0 Commit: 60d24c2c982ef185ac10d08d01a7eca8f6d57e61 Parents: 905b062 ee5d654 Author: Cam McKenzie <[email protected]> Authored: Wed Nov 23 09:10:37 2016 +1100 Committer: Cam McKenzie <[email protected]> Committed: Wed Nov 23 09:10:37 2016 +1100 ---------------------------------------------------------------------- .../recipes/leader/LeaderSelector.java | 48 ++++++++++++++------ 1 file changed, 35 insertions(+), 13 deletions(-) ----------------------------------------------------------------------
