close
Skip to content
This repository was archived by the owner on Oct 13, 2023. It is now read-only.

[18.06] Update swarmkit to 68266392a176434d282760d2d6d0ab4c68edcae6 - #27

Merged
andrewhsu merged 1 commit into
docker-archive:18.06from
thaJeztah:18.06-backport-bump_swarmkit
Jul 18, 2018
Merged

[18.06] Update swarmkit to 68266392a176434d282760d2d6d0ab4c68edcae6#27
andrewhsu merged 1 commit into
docker-archive:18.06from
thaJeztah:18.06-backport-bump_swarmkit

Conversation

@thaJeztah

Copy link
Copy Markdown
Member

cherry-pick of moby#37484 for 18.06

git checkout -b 18.06-backport-bump_swarmkit ce-engine/18.06
git cherry-pick -s -S -x c9377f45529d5dce21c264947b73c7053f316467

cherry-pick was clean; no conflicts

full diff moby/swarmkit@199cf49...6826639

changes included:

changes included:

- swarmkit moby#2706 address unassigned task leak when service is removed
- swarmkit moby#2676 Fix racy batching on the dispatcher
- swarmkit moby#2693 Fix linting issues revealed by Go 1.11

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit c9377f4)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah added this to the 18.06.0 milestone Jul 17, 2018
@thaJeztah

thaJeztah commented Jul 17, 2018

Copy link
Copy Markdown
Member Author

note that upstream PR hasn't been merged yet merged now

@thaJeztah

Copy link
Copy Markdown
Member Author

ping @tiborvass @anshulpundir @dani-docker PTAL

@tiborvass tiborvass left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

LGTM

@andrewhsu
andrewhsu merged commit 9475fe4 into docker-archive:18.06 Jul 18, 2018
@thaJeztah
thaJeztah deleted the 18.06-backport-bump_swarmkit branch July 18, 2018 15:13
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants