diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-02-25 16:50:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-25 16:50:40 +0100 |
| commit | 12e2e6e702a4a11ed054212d994b96c423b4309c (patch) | |
| tree | 03ea3965bcb621d7217c48ee73f304fcf350653d | |
| parent | 9e70411ffc24732049e133c83873f7834edf7c0a (diff) | |
| parent | 06cbf60d41fd3b538840ddb5f341d2f327cb2e8a (diff) | |
| download | podman-12e2e6e702a4a11ed054212d994b96c423b4309c.tar.gz podman-12e2e6e702a4a11ed054212d994b96c423b4309c.tar.bz2 podman-12e2e6e702a4a11ed054212d994b96c423b4309c.zip | |
Merge pull request #2429 from baude/maindups
remove duplicate commands in main
| -rw-r--r-- | cmd/podman/commands.go | 2 | ||||
| -rw-r--r-- | cmd/podman/play_kube.go | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/cmd/podman/commands.go b/cmd/podman/commands.go index fef5f1763..53aa62eb9 100644 --- a/cmd/podman/commands.go +++ b/cmd/podman/commands.go @@ -17,7 +17,6 @@ func getMainCommands() []*cobra.Command { _diffCommand, _execCommand, _generateCommand, - _containerKubeCommand, _playCommand, _psCommand, _loginCommand, @@ -39,7 +38,6 @@ func getMainCommands() []*cobra.Command { _topCommand, _umountCommand, _unpauseCommand, - volumeCommand.Command, _waitCommand, } diff --git a/cmd/podman/play_kube.go b/cmd/podman/play_kube.go index 9fc06dde9..a59460b71 100644 --- a/cmd/podman/play_kube.go +++ b/cmd/podman/play_kube.go @@ -52,8 +52,6 @@ func init() { flags.BoolVarP(&playKubeCommand.Quiet, "quiet", "q", false, "Suppress output information when pulling images") flags.StringVar(&playKubeCommand.SignaturePolicy, "signature-policy", "", "`Pathname` of signature policy file (not usually used)") flags.BoolVar(&playKubeCommand.TlsVerify, "tls-verify", true, "Require HTTPS and verify certificates when contacting registries (default: true)") - - rootCmd.AddCommand(playKubeCommand.Command) } func playKubeYAMLCmd(c *cliconfig.KubePlayValues) error { |