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

Vendor swarmkit 98e5a93 #67

Conversation

aaronlehmann
Copy link
Contributor

This vendors the 17.06 branch of swarmkit. It brings in one bug fix:

@aaronlehmann aaronlehmann mentioned this pull request Jun 12, 2017
40 tasks
@mavenugo
Copy link
Contributor

The RS1 test failure is flaky and tracked under moby/moby#32219

@cyli
Copy link
Contributor

cyli commented Jun 12, 2017

I've cherry-picked moby/swarmkit#2234, waiting on moby/swarmkit#2238 currently.

@cyli
Copy link
Contributor

cyli commented Jun 12, 2017

moby/swarmkit#2238 cherry-picked and pushed to bump_v17.0.6

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
@aaronlehmann
Copy link
Contributor Author

Updated to include moby/swarmkit#2234 and moby/swarmkit#2238.

@aaronlehmann
Copy link
Contributor Author

Closing in favor of #69, which is identical.

@aaronlehmann aaronlehmann deleted the vendor-swarmkit-98e5a93 branch June 13, 2017 01:14
seemethere added a commit to seemethere/docker-ce that referenced this pull request Dec 7, 2017
When building we should default to a dummy version unless otherwise
specified so we don't get ourselves confused over what is official and
what is not.

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
(cherry picked from commit ffcd040)

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
docker-jenkins pushed a commit that referenced this pull request Dec 8, 2017
When building we should default to a dummy version unless otherwise
specified so we don't get ourselves confused over what is official and
what is not.

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: ffcd040
Component: packaging
docker-jenkins pushed a commit that referenced this pull request Oct 4, 2018
…plugin-miss-fix

[18.09] Fix long startup on windows, with non-hns governed Hyper-V networks
Upstream-commit: 6e5ed2ccce0923950dae7a6cb9bd1dd851ed5af8
Component: engine
silvin-lubecki pushed a commit to silvin-lubecki/docker-ce that referenced this pull request Jan 30, 2020
When building we should default to a dummy version unless otherwise
specified so we don't get ourselves confused over what is official and
what is not.

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: ffcd040
Component: packaging
silvin-lubecki pushed a commit to silvin-lubecki/docker-ce that referenced this pull request Jan 30, 2020
When building we should default to a dummy version unless otherwise
specified so we don't get ourselves confused over what is official and
what is not.

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
silvin-lubecki pushed a commit to silvin-lubecki/docker-ce that referenced this pull request Jan 31, 2020
When building we should default to a dummy version unless otherwise
specified so we don't get ourselves confused over what is official and
what is not.

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
(cherry picked from commit ffcd040)

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
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