diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-03-31 16:32:59 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-31 16:32:59 +0200 |
commit | 4e3010d4e761fcb3d6de3b38cac1dc5b4371b129 (patch) | |
tree | 5f5a6a305536a7fa0c67cb3e10cd91da5c997223 /completions | |
parent | 7d4ab3fd8f48c7ded1a226f148e3677a1122c657 (diff) | |
parent | 3449b27cd1743a1353ea8c4503eec5d126d04b0d (diff) | |
download | podman-4e3010d4e761fcb3d6de3b38cac1dc5b4371b129.tar.gz podman-4e3010d4e761fcb3d6de3b38cac1dc5b4371b129.tar.bz2 podman-4e3010d4e761fcb3d6de3b38cac1dc5b4371b129.zip |
Merge pull request #5681 from rhatdan/timeout
Switch to using --time as opposed to --timeout to better match Docker.
Diffstat (limited to 'completions')
-rw-r--r-- | completions/bash/podman | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/completions/bash/podman b/completions/bash/podman index 4a694ca44..77f881d53 100644 --- a/completions/bash/podman +++ b/completions/bash/podman @@ -2161,7 +2161,7 @@ _podman_run() { _podman_restart() { local options_with_args=" - --timeout -t + --time -t " local boolean_options=" --all @@ -2171,8 +2171,6 @@ _podman_restart() { --latest -l --running - --timeout - -t " case "$cur" in -*) @@ -2462,7 +2460,7 @@ _podman_start() { } _podman_stop() { local options_with_args=" - --timeout -t + --time -t " local boolean_options=" --all @@ -2656,7 +2654,7 @@ _podman_generate_systemd() { local options_with_args=" --restart-policy -t - --timeout" + --time" local boolean_options=" -h @@ -3088,7 +3086,7 @@ _podman_pod_start() { _podman_pod_stop() { local options_with_args=" -t - --timeout + --time " local boolean_options=" |