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

Conversation

@andrewhsu
Copy link
Contributor

@andrewhsu andrewhsu commented Jan 11, 2018

backport fix:

with cherry-pick of git commit docker/cli@6be06a3:

$ git cherry-pick -s -x -Xsubtree=components/cli 6be06a3

no conflicts.

Due to a copy/paste error, commands annotated with "swarm"
were incorrectly setting the "kubernetes" property.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 6be06a3db2194e0821eec6f6e9bf78c71e360ddc)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Copy link
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

Copy link
Contributor

@seemethere seemethere left a comment

Choose a reason for hiding this comment

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

LGTM

@seemethere seemethere merged commit ad7d1ef into docker-archive:18.01 Jan 11, 2018
@andrewhsu andrewhsu deleted the d branch January 11, 2018 22:48
cpuguy83 pushed a commit to cpuguy83/docker-ce that referenced this pull request Feb 7, 2018
Fast fail when save directory does not exist
Upstream-commit: eed14e840ca66161c4234ca5c9a19ecdf7ab759f
Component: cli
docker-jenkins pushed a commit that referenced this pull request Sep 27, 2019
[19.03] bump golang 1.12.10 (CVE-2019-16276)
Upstream-commit: 7fe3abf88794f2ebb531d549a3699d8e40c432da
Component: engine
docker-jenkins pushed a commit that referenced this pull request Sep 27, 2019
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.

4 participants