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

[18.09 backport] API: fix status code on conflicting service names #130

Merged

Conversation

thaJeztah
Copy link
Member

Backports of;

Updates swarmkit to the latest version in the bump_18.09 branch;

moby/swarmkit@6186e40...d61ff76

- Description for the changelog

- Fix API return code for conflicting service names [docker/engine#130](https://github.com/docker/engine/pull/130)

This updates the swarmkit vendoring to the latest version in the bump_v18.09
branch

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit b0de11c)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah added this to the 18.09.1 milestone Dec 10, 2018
@thaJeztah thaJeztah changed the title [18.09 backport] API: Add test for status code on conflicting service names [18.09 backport] API: fix status code on conflicting service names Dec 10, 2018
Copy link

@andrewhsu andrewhsu left a comment

Choose a reason for hiding this comment

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

LGTM on green

i see flakey failure on experimental that is not a blocker for this merge:

FAIL: docker_cli_swarm_test.go:1376: DockerSwarmSuite.TestSwarmClusterRotateUnlockKey

@andrewhsu andrewhsu merged commit 42b5827 into docker-archive:18.09 Dec 13, 2018
@thaJeztah thaJeztah deleted the 18.09_backport_fix_api_return_code branch December 14, 2018 02:16
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