Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[20.10 backport] documentation and completion-script fixes #2957

Merged
merged 13 commits into from
Feb 18, 2021

Conversation

thaJeztah
Copy link
Member

backports:

# https://github.com/docker/cli/pull/2887 Add bash completion for jobs
git cherry-pick -s -S -x a4e86b543304726bb5639892a045f319a0471fc0

# https://github.com/docker/cli/pull/2915 Remove duplicate word in push.md
git cherry-pick -s -S -x 69b5487e394b5b358461e1337009491c20e39dfb

# https://github.com/docker/cli/pull/2912 Add bash completion for `docker run|create --pull`
git cherry-pick -s -S -x 8242fe1fcc3ac190396a4f8aae887f51ab84b044

# https://github.com/docker/cli/pull/2914 Add bash completion for `dockerd --ip6tables`
git cherry-pick -s -S -x ba2fef9bcb6e6abde537cb51dce45b6fa6eca62a

# https://github.com/docker/cli/pull/2913 Update bash completion for fluentd --log-options
git cherry-pick -s -S -x 5a252fb3ad1dc9b876cd456f36637cfa1ba3ea1d

# https://github.com/docker/cli/pull/2908 deprecate blkio-weight options with cgroups v1
git cherry-pick -s -S -x fb2ea098a989f5a629dd4d5e58d6b48e4e21ca4b

# https://github.com/docker/cli/pull/2921 docs: fix typo in deprecated.md
git cherry-pick -s -S -x 697c3a5b48dbdb9890230b1e3569c5755ee2333d

# https://github.com/docker/cli/pull/2942 docs: add redirect for old reference URL
git cherry-pick -s -S -x a4fb01f957e63e2fd2d39d4e12119ede676b14c4

# https://github.com/docker/cli/pull/2906 Added docker context to zsh completion
git cherry-pick -s -S -x 584c08e1fe2d0334e9e19e5ae70efb486b2ed706 b04241d95a5638b3b980da74dbaab3cc2a2c0c52

# https://github.com/docker/cli/pull/2944 docs: Fix wrong variable name
git cherry-pick  -s -S -x 852fe059918fd7634c3f7975893a9df4855ee1bf

# https://github.com/docker/cli/pull/2949 fix docker-run man page table formatting
git cherry-pick -s -S -x c0b7b58134b6b24649ccedfbd7403473d9e3f0cc

# https://github.com/docker/cli/pull/2951 Add docs and completion for docker node ls --filter node.label
git cherry-pick -s -S -x f52a9e2fef047368863d2a8c141db98b045b7847

albers and others added 13 commits February 4, 2021 14:32
Signed-off-by: Harald Albers <[email protected]>
(cherry picked from commit a4e86b5)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
Signed-off-by: Roch Feuillade <[email protected]>
(cherry picked from commit 69b5487)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
Signed-off-by: Harald Albers <[email protected]>
(cherry picked from commit 8242fe1)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
Signed-off-by: Harald Albers <[email protected]>
(cherry picked from commit ba2fef9)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
Signed-off-by: Harald Albers <[email protected]>
(cherry picked from commit 5a252fb)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
These options were deprecated and removed in the Linux kernel v5.0 and up in;

- torvalds/linux@f382fb0
- torvalds/linux@fb5772c
- torvalds/linux@23aa164

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit fb2ea09)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit 697c3a5)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit a4fb01f)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
Signed-off-by: Christopher Svensson <[email protected]>
(cherry picked from commit 584c08e)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
Signed-off-by: Christopher Svensson <[email protected]>
(cherry picked from commit b04241d)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
Signed-off-by: LeeDongGeon <[email protected]>
(cherry picked from commit 852fe05)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit c0b7b58)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit f52a9e2)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@codecov-io
Copy link

Codecov Report

Merging #2957 (2b74b90) into 20.10 (48d30b5) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##            20.10    #2957   +/-   ##
=======================================
  Coverage   57.02%   57.02%           
=======================================
  Files         297      297           
  Lines       18666    18666           
=======================================
  Hits        10644    10644           
  Misses       7157     7157           
  Partials      865      865           

Copy link
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 d3cb89e into docker:20.10 Feb 18, 2021
@thaJeztah thaJeztah deleted the 20.10_backport_docs_fixes branch February 18, 2021 11:15
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.

7 participants