[20.10] Bump swarmkit to get fix for rollback#42875
Merged
Merged
Conversation
Signed-off-by: Adam Williams <[email protected]>
thaJeztah
changed the title
Member
|
@dperny PTAL |
Contributor
|
Yup, looks good to me. |
Contributor
Author
|
@thaJeztah Could we get this merged now? Thanks! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Signed-off-by: Adam Williams [email protected]
- What I did
Update Swarmkit version to get fix for rollback issue 3003/ 3014
When the updateConfig delay parameter is larger than the monitor parameter an error in updating can be missed and rollback not performed. This fix will check for the case where monitor < delay and use the larger of the two.
- How I did it
- How to verify it
- Description for the changelog
- A picture of a cute animal (not mandatory but encouraged)