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 to 4b872cfac8ffc0cc7fff434902cc05dbc7612da5 #19

Merged
merged 1 commit into from
Jun 6, 2017

Conversation

@aaronlehmann
Copy link
Contributor

LGTM

Note that there is another swarmkit PR that is proposed for 17.06: moby/swarmkit#2211

@cyli
Copy link
Contributor

cyli commented Jun 2, 2017

Actually apologies, I'd like to also propose moby/swarmkit#2213 although it's less show-stopping.

@mavenugo mavenugo mentioned this pull request Jun 2, 2017
23 tasks
@andrewhsu
Copy link
Contributor

This PR brings in git commit moby/swarmkit@f7a002c into the engine's vendor dir to address issue moby/swarmkit#2203

I've confirmed the vendor.conf change in this PR is only pulling in the one desired commit without the tests (because vndr would have stripped the test out of the vendor dir):
moby/swarmkit@1a3e510...f7a002c

@andrewhsu
Copy link
Contributor

i rebased

Includes:
- moby/swarmkit#2203
- moby/swarmkit#2210
- moby/swarmkit#2212

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
Signed-off-by: Tibor Vass <tibor@docker.com>
@tiborvass tiborvass changed the title [17.06] Re-vendor SwarmKit to f7a002c5f1d497158c211285813c3b10d6d0f5c5 [17.06] Re-vendor SwarmKit to 4b872cfac8ffc0cc7fff434902cc05dbc7612da5 Jun 6, 2017
@andrewhsu
Copy link
Contributor

LGTM

integration tests and unit tests are green

@andrewhsu andrewhsu merged commit ce44edf into docker-archive:17.06 Jun 6, 2017
@andrewhsu andrewhsu modified the milestone: 17.06.0 Jul 12, 2017
andrewhsu added a commit that referenced this pull request Jul 14, 2017
Increment RPM changelog to docker-ce 17.06.0-ce
Upstream-commit: d6cdd2c
Component: packaging
docker-jenkins pushed a commit that referenced this pull request Jul 11, 2018
[18.06] Bump libnetwork to d00ceed44cc447c77f25cdf5d59e83163bdcb4c9
Upstream-commit: 26055afbd4df72d6efa59159e9d673a46433b6f7
Component: engine
silvin-lubecki pushed a commit to silvin-lubecki/docker-ce that referenced this pull request Jan 30, 2020
Increment RPM changelog to docker-ce 17.06.0-ce
Upstream-commit: d6cdd2c
Component: packaging
silvin-lubecki pushed a commit to silvin-lubecki/docker-ce that referenced this pull request Jan 30, 2020
Increment RPM changelog to docker-ce 17.06.0-ce
silvin-lubecki pushed a commit to silvin-lubecki/docker-ce that referenced this pull request Feb 3, 2020
[17.06] Re-vendor SwarmKit to 4b872cfac8ffc0cc7fff434902cc05dbc7612da5
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.

5 participants