Skip to content

Conversation

@ywelsch
Copy link
Contributor

@ywelsch ywelsch commented Feb 27, 2019

Cherry-picks a few commits from #39466 to align 7.x with master branch.

Note to reviewer: These are just plain cherry-picks, so by reviewing #39466, no extra work needs to be done here

Relates to #39466

@ywelsch ywelsch added >non-issue v7.0.0 :Distributed Coordination/Cluster Coordination Cluster formation and cluster state publication, including cluster membership and fault detection. v7.2.0 labels Feb 27, 2019
@elasticmachine
Copy link
Collaborator

Pinging @elastic/es-distributed

@ywelsch ywelsch mentioned this pull request Feb 27, 2019
@ywelsch ywelsch requested a review from DaveCTurner February 28, 2019 07:55
Copy link
Contributor

@DaveCTurner DaveCTurner left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@ywelsch ywelsch merged commit 936dbb0 into elastic:7.x Mar 4, 2019
ywelsch added a commit that referenced this pull request Mar 4, 2019
Removes all traces of Zen1 from the code base. Some of these commits will also be backported to
7.0/7.x (#39470) as the cluster.coordination package was making use of some things in
discovery.zen and we want to keep 7.x as close as possible to master.
ywelsch added a commit that referenced this pull request Mar 4, 2019
Cherry-picks a few commits from #39466 to align 7.x with master branch.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

:Distributed Coordination/Cluster Coordination Cluster formation and cluster state publication, including cluster membership and fault detection. >non-issue v7.0.0-rc1 v7.2.0

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants