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

[17.06] Re-vendor swarmkit for various fixes #134

Merged
merged 1 commit into from
Jul 26, 2017
Merged

[17.06] Re-vendor swarmkit for various fixes #134

merged 1 commit into from
Jul 26, 2017

Conversation

cyli
Copy link
Contributor

@cyli cyli commented Jul 25, 2017

Vendor to moby/swarmkit@a0a7f6f.

This includes swarmkit fixes for the following 3 issues:

Comparing differences: moby/swarmkit@fb828ce...a0a7f6f

@andrewhsu andrewhsu modified the milestones: 17.07.0, 17.06.1 Jul 25, 2017
- moby/swarmkit#2309 (updating the service spec version when rolling back)
- moby/swarmkit#2310 (fix for slow swarm shutdown)
- moby/swarmkit#2323 (run watchapi server on all managers)

Signed-off-by: Ying <ying.li@docker.com>
@cyli
Copy link
Contributor Author

cyli commented Jul 26, 2017

The windows failure seems unrelated:

23:22:03 re-exec error: exit status 1: output: time="2017-07-25T23:21:52Z" level=error msg="hcsshim::ImportLayer failed in Win32: The system cannot find the path specified. (0x3) layerId=\\\\?\\D:\\control\\windowsfilter\\05f410c6c19b2d0f86a2ff0d08f1e07bb070c9f83c3f4ac267e6983abe12eb77 flavour=1 folder=d:\\temp\\hcs485500983" 
23:22:03 hcsshim::ImportLayer failed in Win32: The system cannot find the path specified. (0x3) layerId=\\?\D:\control\windowsfilter\05f410c6c19b2d0f86a2ff0d08f1e07bb070c9f83c3f4ac267e6983abe12eb77 flavour=1 folder=d:\temp\hcs485500983

@andrewhsu andrewhsu changed the title [17.06.1] Re-vendor swarmkit for various fixes [17.06] Re-vendor swarmkit for various fixes Jul 26, 2017
@andrewhsu
Copy link
Contributor

LGTM

@andrewhsu andrewhsu merged commit 96bbcbf into docker-archive:17.06 Jul 26, 2017
@cyli cyli deleted the re-vendor-swarmkit branch July 26, 2017 23:52
docker-jenkins pushed a commit that referenced this pull request Aug 7, 2018
Add tar targets for engine image
Upstream-commit: d645291
Component: packaging
silvin-lubecki pushed a commit to silvin-lubecki/docker-ce that referenced this pull request Feb 3, 2020
[17.06] Re-vendor swarmkit for various fixes
akrasnov-drv pushed a commit to drivenets/docker-ce that referenced this pull request Apr 23, 2023
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.

2 participants