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

[17.12] Add REMOVE and ORPHANED to TaskState#422

Merged
andrewhsu merged 1 commit intodocker-archive:17.12from
thaJeztah:17.12-backport-36142-TaskState
Feb 20, 2018
Merged

[17.12] Add REMOVE and ORPHANED to TaskState#422
andrewhsu merged 1 commit intodocker-archive:17.12from
thaJeztah:17.12-backport-36142-TaskState

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

@thaJeztah thaJeztah commented Feb 13, 2018

back port of moby/moby#36146 for 17.12

git checkout -b 17.12-backport-36142-TaskState upstream/17.12
git cherry-pick -s -S -x -Xsubtree=components/engine a40687f5ac7df27bc6c6c3a6f69513a397a1a05a

no conclicts

This fix tries to address the issue raised in 36142 where
there are discrepancies between Swarm API and swagger.yaml.

This fix adds two recently added state REMOVE and ORPHANED to TaskState.

This fix fixes 36142.

Signed-off-by: Yong Tang yong.tang.github@outlook.com
(cherry picked from commit a40687f)
Signed-off-by: Sebastiaan van Stijn github@gone.nl

This fix tries to address the issue raised in 36142 where
there are discrepancies between Swarm API and swagger.yaml.

This fix adds two recently added state `REMOVE` and `ORPHANED` to TaskState.

This fix fixes 36142.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
(cherry picked from commit a40687f)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah added this to the 17.12.1 milestone Feb 13, 2018
@andrewhsu andrewhsu merged commit e634ffe into docker-archive:17.12 Feb 20, 2018
@thaJeztah thaJeztah deleted the 17.12-backport-36142-TaskState branch February 20, 2018 15:55
docker-jenkins pushed a commit that referenced this pull request Nov 13, 2019
[19.03] vendor: update buildkit to 928f3b48
Upstream-commit: ea84732a77251e0d7af278e2b7df1d6a59fca46b
Component: engine
silvin-lubecki pushed a commit to silvin-lubecki/docker-ce that referenced this pull request Feb 3, 2020
…6142-TaskState

[17.12] Add `REMOVE` and `ORPHANED` to TaskState
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.

4 participants