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

[18.06] Bump swarmkit to include task reaper fixes and more metrics. #13

Merged

Conversation

thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Jul 5, 2018

cherry-pick of moby#37399 for 18.06. cherry pick was clean, no conflicts

This includes the following behavior-modifying PRs:

This includes the following behavior-modifying PRs:

- moby/swarmkit#2673
- moby/swarmkit#2669
- moby/swarmkit#2675
- moby/swarmkit#2664

Signed-off-by: Ying Li <ying.li@docker.com>
(cherry picked from commit b322705)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
Copy link
Member Author

oh whoops; duplicate of #12

@thaJeztah
Copy link
Member Author

hm; I see that one was a "custom" PR, not a cherry-pick; perhaps we should use this one still. Let me keep it open so that we can decide which one to take @cyli @tiborvass

@cyli
Copy link

cyli commented Jul 6, 2018

@thaJeztah Ah sorry, I think I did not do git cherry-pick -x

@thaJeztah
Copy link
Member Author

ping @cyli @andrewhsu @vdemeester @tiborvass PTAL

Copy link

@vdemeester vdemeester left a comment

Choose a reason for hiding this comment

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

LGTM 🐸

Copy link

@cyli cyli left a comment

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 73ca638 into docker-archive:18.06 Jul 8, 2018
@thaJeztah thaJeztah deleted the 18.06-backport_bump-swarmkit branch July 8, 2018 19:19
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.

4 participants