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 /pkg/domain/infra/tunnel | |
| 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 'pkg/domain/infra/tunnel')
| -rw-r--r-- | pkg/domain/infra/tunnel/containers.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/domain/infra/tunnel/containers.go b/pkg/domain/infra/tunnel/containers.go index 36b7bf535..1981055e2 100644 --- a/pkg/domain/infra/tunnel/containers.go +++ b/pkg/domain/infra/tunnel/containers.go @@ -100,7 +100,7 @@ func (ic *ContainerEngine) ContainerStop(ctx context.Context, namesOrIds []strin } for _, c := range ctrs { report := entities.StopReport{Id: c.ID} - if err = containers.Stop(ic.ClientCxt, c.ID, &options.Timeout); err != nil { + if err = containers.Stop(ic.ClientCxt, c.ID, options.Timeout); err != nil { // These first two are considered non-fatal under the right conditions if errors.Cause(err).Error() == define.ErrCtrStopped.Error() { logrus.Debugf("Container %s is already stopped", c.ID) |