Skip to content

[18.06] backport various Bash completion script updates#1272

Merged
silvin-lubecki merged 7 commits into
docker:18.06from
thaJeztah:18.06-completion-updates
Aug 7, 2018
Merged

[18.06] backport various Bash completion script updates#1272
silvin-lubecki merged 7 commits into
docker:18.06from
thaJeztah:18.06-completion-updates

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

Cherry-picks of the following PR's for 18.06

git checkout -b 18.06-completion-updates upstream/18.06

# https://github.com/docker/cli/pull/1215
git cherry-pick -s -S -x 4912846de22fe3efd4b9fe8e3059615948f9112a

# https://github.com/docker/cli/pull/1254
git cherry-pick -s -S -x ff953751d342f7815060593d14763030af77621c
git cherry-pick -s -S -x 8ef01e869ea55aa3eb860ee4e7e60a44a5d0ff81
git cherry-pick -s -S -x 08f8ee13200d0a69b1e4fbd72ffe9c7d55a152b4

# https://github.com/docker/cli/pull/1256
git cherry-pick -s -S -x 9022a00fbe2aa47da5a17652144b028dc32292d9

# https://github.com/docker/cli/pull/1269
git cherry-pick -s -S -x b9b3754ad3fc795942bc7388b8d143701bf19515

# https://github.com/docker/cli/pull/1271
git cherry-pick -s -S -x e587ec293bf154281215189487d7504cc1d70666

cherry-pick was clean; no conflicts

albers and others added 7 commits August 4, 2018 01:42
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 4912846)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit ff95375)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 8ef01e8)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 08f8ee1)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Clean maintainers and code owners files

Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
(cherry picked from commit 9022a00)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit b9b3754)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit e587ec2)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Copy link
Copy Markdown
Collaborator

@albers albers left a comment

Choose a reason for hiding this comment

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

LGTM, thanks

Copy link
Copy Markdown
Contributor

@silvin-lubecki silvin-lubecki left a comment

Choose a reason for hiding this comment

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

LGTM

@silvin-lubecki silvin-lubecki merged commit 2749843 into docker:18.06 Aug 7, 2018
@thaJeztah thaJeztah deleted the 18.06-completion-updates branch August 7, 2018 17:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants