aboutsummaryrefslogtreecommitdiff
path: root/cmd/podman/common.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-03-15 06:22:46 -0700
committerGitHub <noreply@github.com>2019-03-15 06:22:46 -0700
commitccf991f530dbe41d86b904ec900fda01ae3e1474 (patch)
treeb1ae19c5cebdefbcedd5532108e30680cc687aad /cmd/podman/common.go
parent37dcc0a305a1606de7c0f5521d11250a4318bb51 (diff)
parent1e124306dbd35a4cfdf3f585119a2c4441ec543d (diff)
downloadpodman-ccf991f530dbe41d86b904ec900fda01ae3e1474.tar.gz
podman-ccf991f530dbe41d86b904ec900fda01ae3e1474.tar.bz2
podman-ccf991f530dbe41d86b904ec900fda01ae3e1474.zip
Merge pull request #2633 from edsantiago/default_default
Usage messages: deduplicate '(default true)' et al
Diffstat (limited to 'cmd/podman/common.go')
-rw-r--r--cmd/podman/common.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd/podman/common.go b/cmd/podman/common.go
index b76037297..43dfdb837 100644
--- a/cmd/podman/common.go
+++ b/cmd/podman/common.go
@@ -313,7 +313,7 @@ func getCreateFlags(c *cliconfig.PodmanCommand) {
)
createFlags.String(
"image-volume", "bind",
- "Tells podman how to handle the builtin image volumes. The options are: 'bind', 'tmpfs', or 'ignore' (default 'bind')",
+ "Tells podman how to handle the builtin image volumes. The options are: 'bind', 'tmpfs', or 'ignore'",
)
createFlags.Bool(
"init", false,
@@ -374,7 +374,7 @@ func getCreateFlags(c *cliconfig.PodmanCommand) {
)
createFlags.Int64(
"memory-swappiness", -1,
- "Tune container memory swappiness (0 to 100) (default -1)",
+ "Tune container memory swappiness (0 to 100, or -1 for system default)",
)
createFlags.String(
"name", "",