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

[19.03 backport] ConstraintEnforcer fix#220

Merged
thaJeztah merged 1 commit intodocker-archive:19.03from
dperny:19.03-backport-constraintenforcer-fix
May 21, 2019
Merged

[19.03 backport] ConstraintEnforcer fix#220
thaJeztah merged 1 commit intodocker-archive:19.03from
dperny:19.03-backport-constraintenforcer-fix

Conversation

@dperny
Copy link
Copy Markdown

@dperny dperny commented May 20, 2019

Revendors docker/swarmkit to backport fixes made to the ConstraintEnforcer (see moby/swarmkit#2857)

Revendors docker/swarmkit to backport fixes made to the
ConstraintEnforcer (see moby/swarmkit#2857)

Signed-off-by: Drew Erny <drew.erny@docker.com>
@thaJeztah thaJeztah added this to the 19.03.0 milestone May 20, 2019
Copy link
Copy Markdown
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@thaJeztah
Copy link
Copy Markdown
Member

Failures are due to Docker Hub returning different search results;

19:18:21 ----------------------------------------------------------------------
19:18:21 FAIL: docker_cli_search_test.go:47: DockerSuite.TestSearchCmdOptions
19:18:21 

fix is being worked on in moby#39243

@thaJeztah
Copy link
Copy Markdown
Member

All other tests passed, so I'm bringing this one in

@thaJeztah thaJeztah merged commit 55c5381 into docker-archive:19.03 May 21, 2019
@jlhawn
Copy link
Copy Markdown

jlhawn commented May 23, 2019

@thaJeztah @dperny was this merged into the master branch in this repository too? I couldn't find it by looking at the recent commits on master.

@thaJeztah
Copy link
Copy Markdown
Member

No I don't think a PR was opened to get it upstream

@dperny
Copy link
Copy Markdown
Author

dperny commented May 24, 2019

right, right. forgot about vendoring into master.

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