diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-03-15 06:22:46 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-15 06:22:46 -0700 |
| commit | ccf991f530dbe41d86b904ec900fda01ae3e1474 (patch) | |
| tree | b1ae19c5cebdefbcedd5532108e30680cc687aad /cmd/podman/main.go | |
| parent | 37dcc0a305a1606de7c0f5521d11250a4318bb51 (diff) | |
| parent | 1e124306dbd35a4cfdf3f585119a2c4441ec543d (diff) | |
| download | podman-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/main.go')
| -rw-r--r-- | cmd/podman/main.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd/podman/main.go b/cmd/podman/main.go index af6731d96..1717e0624 100644 --- a/cmd/podman/main.go +++ b/cmd/podman/main.go @@ -115,7 +115,7 @@ func init() { rootCmd.PersistentFlags().StringVar(&MainGlobalOpts.DefaultMountsFile, "default-mounts-file", "", "Path to default mounts file") rootCmd.PersistentFlags().MarkHidden("defaults-mount-file") rootCmd.PersistentFlags().StringSliceVar(&MainGlobalOpts.HooksDir, "hooks-dir", []string{}, "Set the OCI hooks directory path (may be set multiple times)") - rootCmd.PersistentFlags().StringVar(&MainGlobalOpts.LogLevel, "log-level", "error", "Log messages above specified level: debug, info, warn, error (default), fatal or panic") + rootCmd.PersistentFlags().StringVar(&MainGlobalOpts.LogLevel, "log-level", "error", "Log messages above specified level: debug, info, warn, error, fatal or panic") rootCmd.PersistentFlags().IntVar(&MainGlobalOpts.MaxWorks, "max-workers", 0, "The maximum number of workers for parallel operations") rootCmd.PersistentFlags().MarkHidden("max-workers") rootCmd.PersistentFlags().StringVar(&MainGlobalOpts.Namespace, "namespace", "", "Set the libpod namespace, used to create separate views of the containers and pods on the system") |