diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-12-21 12:09:46 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-21 12:09:46 -0800 |
| commit | fe186c6ebba95db89463f38c6aa0f0dcc104a249 (patch) | |
| tree | d2a815c62bae205b0ea80ac72ec72542c98131ce /cmd/podman/create.go | |
| parent | fa568e04d6b6032ca3bdf39ee4fd1ca1856be85a (diff) | |
| parent | 1ad6f9af1552cbe2119af6cda83db5b3908556db (diff) | |
| download | podman-fe186c6ebba95db89463f38c6aa0f0dcc104a249.tar.gz podman-fe186c6ebba95db89463f38c6aa0f0dcc104a249.tar.bz2 podman-fe186c6ebba95db89463f38c6aa0f0dcc104a249.zip | |
Merge pull request #2033 from rhatdan/devices
Allow users to specify a directory for additonal devices
Diffstat (limited to 'cmd/podman/create.go')
| -rw-r--r-- | cmd/podman/create.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd/podman/create.go b/cmd/podman/create.go index 2b31a6423..1425892cc 100644 --- a/cmd/podman/create.go +++ b/cmd/podman/create.go @@ -462,7 +462,7 @@ func parseCreateOpts(ctx context.Context, c *cli.Context, runtime *libpod.Runtim tty := c.Bool("tty") if c.Bool("detach") && c.Bool("rm") { - return nil, errors.Errorf("--rm and --detach can not be specified together") + return nil, errors.Errorf("--rm and --detach cannot be specified together") } if c.Int64("cpu-period") != 0 && c.Float64("cpus") > 0 { return nil, errors.Errorf("--cpu-period and --cpus cannot be set together") |