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

[17.07] Re-vendor swarmkit#139

Merged
andrewhsu merged 1 commit into
docker-archive:17.07from
cyli:re-vendor-swarmkit-17.07
Jul 26, 2017
Merged

[17.07] Re-vendor swarmkit#139
andrewhsu merged 1 commit into
docker-archive:17.07from
cyli:re-vendor-swarmkit-17.07

Conversation

@cyli
Copy link
Copy Markdown
Contributor

@cyli cyli commented Jul 25, 2017

Apologies, in #136, I forgot about also including the following fix:

- moby/swarmkit#2323 (fix for watch server being run only on leader)

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

LGTM

test failures are not related to the PR code...being addressed in #140

@andrewhsu andrewhsu added this to the 17.07.0 milestone Jul 26, 2017
@andrewhsu andrewhsu merged commit 3ddc583 into docker-archive:17.07 Jul 26, 2017
@cyli cyli deleted the re-vendor-swarmkit-17.07 branch July 26, 2017 01:53
docker-jenkins pushed a commit that referenced this pull request Mar 1, 2018
Silent login: use credentials from cred store to login
Upstream-commit: 2cc6ff131d9186eb5b2eeea31b4f66010a1502a2
Component: cli
docker-jenkins pushed a commit that referenced this pull request Aug 14, 2018
docker-jenkins pushed a commit that referenced this pull request Dec 16, 2018
[18.09] Propagate context to exec delete
Upstream-commit: cc7773c787f400e7b11472878c3a1e55823e9c46
Component: engine
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