diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-06-08 03:56:11 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-08 03:56:11 -0400 |
| commit | 2869cce1d53aedfe2500f3d921fb901dd5994690 (patch) | |
| tree | 16801ea44c3ca4f79c78cb5fbbac65416e0dd86b /cmd/podman | |
| parent | 1fcb6788a5d7471a7ca6215a40e36e21812a0f6e (diff) | |
| parent | 1cc9731dfad9ec06ab162ce432c82ec4d675e60e (diff) | |
| download | podman-2869cce1d53aedfe2500f3d921fb901dd5994690.tar.gz podman-2869cce1d53aedfe2500f3d921fb901dd5994690.tar.bz2 podman-2869cce1d53aedfe2500f3d921fb901dd5994690.zip | |
Merge pull request #6505 from mheon/parallel_stop
Add parallel operation to `podman stop`
Diffstat (limited to 'cmd/podman')
| -rw-r--r-- | cmd/podman/containers/stop.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/cmd/podman/containers/stop.go b/cmd/podman/containers/stop.go index 22c487961..0f2a91af0 100644 --- a/cmd/podman/containers/stop.go +++ b/cmd/podman/containers/stop.go @@ -85,9 +85,8 @@ func stop(cmd *cobra.Command, args []string) error { var ( errs utils.OutputErrors ) - stopOptions.Timeout = containerConfig.Engine.StopTimeout if cmd.Flag("time").Changed { - stopOptions.Timeout = stopTimeout + stopOptions.Timeout = &stopTimeout } responses, err := registry.ContainerEngine().ContainerStop(context.Background(), args, stopOptions) |