Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "dispatcher: Give a couple of minutes for nodes to recover on re-election" #1240

Merged

Conversation

aluzzardi
Copy link
Member

Reverts #1238

Breaks docker/docker integration tests.

@aaronlehmann
Copy link
Collaborator

Needs Signed-off-by.

@GordonTheTurtle
Copy link

Please sign your commits following these rules:
https://github.com/docker/docker/blob/master/CONTRIBUTING.md#sign-your-work
The easiest way to do this is to amend the last commit:

$ git clone -b "revert-1238-dispatcher-unknown-extra-graceperiod" git@github.com:docker/swarmkit.git somewhere
$ cd somewhere
$ git commit --amend -s --no-edit
$ git push -f

Ammending updates the existing PR. You DO NOT need to open a new one.

@aluzzardi aluzzardi force-pushed the revert-1238-dispatcher-unknown-extra-graceperiod branch from 9bbf86f to be1b8bc Compare July 26, 2016 07:38
…re-election"

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
@aluzzardi aluzzardi force-pushed the revert-1238-dispatcher-unknown-extra-graceperiod branch from be1b8bc to d4c4812 Compare July 26, 2016 07:40
@aaronlehmann
Copy link
Collaborator

LGTM

@abronan
Copy link
Contributor

abronan commented Jul 26, 2016

LGTM 😢

@aluzzardi
Copy link
Member Author

/cc @LK4D4 @thaJeztah

Had to revert because of broken integration test and no easy fix.

Will need something else for moby/moby#25017

@aaronlehmann aaronlehmann merged commit 7e6cb5d into master Jul 26, 2016
@aaronlehmann aaronlehmann deleted the revert-1238-dispatcher-unknown-extra-graceperiod branch July 26, 2016 07:55
@thaJeztah
Copy link
Member

@aluzzardi yup, saw the discussion on slack; thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants