New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[17.06] Re-vendor SwarmKit to 4b872cfac8ffc0cc7fff434902cc05dbc7612da5 #19

Merged
merged 1 commit into from Jun 6, 2017

Conversation

Projects
None yet
5 participants
@aluzzardi
Contributor

aluzzardi commented Jun 1, 2017

@aaronlehmann

This comment has been minimized.

Show comment
Hide comment
@aaronlehmann

aaronlehmann Jun 1, 2017

Contributor

LGTM

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

Contributor

aaronlehmann commented Jun 1, 2017

LGTM

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

@cyli

This comment has been minimized.

Show comment
Hide comment
@cyli

cyli Jun 2, 2017

Contributor

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

Contributor

cyli commented Jun 2, 2017

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

@mavenugo mavenugo referenced this pull request Jun 2, 2017

Closed

17.06.0 RC2 tracker #2

23 of 23 tasks complete

@mlaventure mlaventure added the 17.06 label Jun 5, 2017

@andrewhsu

This comment has been minimized.

Show comment
Hide comment
@andrewhsu

andrewhsu Jun 6, 2017

Collaborator

This PR brings in git commit docker/swarmkit@f7a002c into the engine's vendor dir to address issue docker/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):
docker/swarmkit@1a3e510...f7a002c

Collaborator

andrewhsu commented Jun 6, 2017

This PR brings in git commit docker/swarmkit@f7a002c into the engine's vendor dir to address issue docker/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):
docker/swarmkit@1a3e510...f7a002c

@andrewhsu

This comment has been minimized.

Show comment
Hide comment
@andrewhsu

andrewhsu Jun 6, 2017

Collaborator

i rebased

Collaborator

andrewhsu commented Jun 6, 2017

i rebased

Re-vendor SwarmKit to 4b872cfac8ffc0cc7fff434902cc05dbc7612da5
Includes:
- docker/swarmkit#2203
- docker/swarmkit#2210
- docker/swarmkit#2212

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
Signed-off-by: Tibor Vass <tibor@docker.com>

@tiborvass tiborvass changed the title from [17.06] Re-vendor SwarmKit to f7a002c5f1d497158c211285813c3b10d6d0f5c5 to [17.06] Re-vendor SwarmKit to 4b872cfac8ffc0cc7fff434902cc05dbc7612da5 Jun 6, 2017

@andrewhsu

This comment has been minimized.

Show comment
Hide comment
@andrewhsu

andrewhsu Jun 6, 2017

Collaborator

LGTM

integration tests and unit tests are green

Collaborator

andrewhsu commented Jun 6, 2017

LGTM

integration tests and unit tests are green

@andrewhsu andrewhsu merged commit ce44edf into docker:17.06 Jun 6, 2017

2 checks passed

ce-tests Jenkins build docker-ce-17.06-pr 37 has succeeded
Details
dco-signed All commits are signed

@andrewhsu andrewhsu modified the milestone: 17.06.0 Jul 12, 2017

andrewhsu added a commit that referenced this pull request Jul 14, 2017

Merge pull request #19 from seemethere/increment_to_ga
Increment RPM changelog to docker-ce 17.06.0-ce
Upstream-commit: d6cdd2cd4edc041e0887b741ae11ae9e925eb055
Component: packaging

docker-jenkins pushed a commit that referenced this pull request Jul 11, 2018

Merge pull request #19 from thaJeztah/18.06-backport-bump_libnetwork
[18.06] Bump libnetwork to d00ceed44cc447c77f25cdf5d59e83163bdcb4c9
Upstream-commit: 26055afbd4df72d6efa59159e9d673a46433b6f7
Component: engine
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment