diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-02-28 03:54:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-28 03:54:53 +0100 |
| commit | bbf54aaab7a4dacbbeec37a76126d953b47ef98a (patch) | |
| tree | 50fd9e340d96b2fa560f85da6c12b3fb9771329a /cmd/podman/restart.go | |
| parent | 6f0dbd004fecadb6d0d07bb8012231d25d61684f (diff) | |
| parent | 37f447d78ec88267f81c6eb3843a63bf9f36e268 (diff) | |
| download | podman-bbf54aaab7a4dacbbeec37a76126d953b47ef98a.tar.gz podman-bbf54aaab7a4dacbbeec37a76126d953b47ef98a.tar.bz2 podman-bbf54aaab7a4dacbbeec37a76126d953b47ef98a.zip | |
Merge pull request #2476 from mheon/fix_stop
Fix ignored --stop-timeout flag to 'podman create'
Diffstat (limited to 'cmd/podman/restart.go')
| -rw-r--r-- | cmd/podman/restart.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd/podman/restart.go b/cmd/podman/restart.go index 2bebde4f9..5aa12070e 100644 --- a/cmd/podman/restart.go +++ b/cmd/podman/restart.go @@ -73,7 +73,7 @@ func restartCmd(c *cliconfig.RestartValues) error { defer runtime.Shutdown(false) timeout := c.Timeout - useTimeout := c.Flag("timeout").Changed + useTimeout := c.Flag("timeout").Changed || c.Flag("time").Changed // Handle --latest if c.Latest { |