diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-05-08 17:41:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-08 17:41:48 +0200 |
| commit | 2547fe53127057ce8f3ba065b4263fea32be7f0d (patch) | |
| tree | ee2a6e1a9d8dc186d49a825621e2ac9cd3e06544 /cmd | |
| parent | fa7589b6a6a513b7449b59535221aaee809cb239 (diff) | |
| parent | 5cbb0b8a665eb28b5b47212d35a6204d2be202fb (diff) | |
| download | podman-2547fe53127057ce8f3ba065b4263fea32be7f0d.tar.gz podman-2547fe53127057ce8f3ba065b4263fea32be7f0d.tar.bz2 podman-2547fe53127057ce8f3ba065b4263fea32be7f0d.zip | |
Merge pull request #6137 from rhatdan/VENDOR
Fix handling of overridden paths from database
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/podman/login.go | 1 | ||||
| -rw-r--r-- | cmd/podman/logout.go | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/cmd/podman/login.go b/cmd/podman/login.go index 8413861f5..92f13d0e7 100644 --- a/cmd/podman/login.go +++ b/cmd/podman/login.go @@ -46,7 +46,6 @@ func init() { // Podman flags. flags.BoolVarP(&loginOptions.tlsVerify, "tls-verify", "", false, "Require HTTPS and verify certificates when contacting registries") - flags.BoolVarP(&loginOptions.GetLoginSet, "get-login", "", false, "Return the current login user for the registry") loginOptions.Stdin = os.Stdin loginOptions.Stdout = os.Stdout loginOptions.AcceptUnspecifiedRegistry = true diff --git a/cmd/podman/logout.go b/cmd/podman/logout.go index d0afc21b4..c016de8ae 100644 --- a/cmd/podman/logout.go +++ b/cmd/podman/logout.go @@ -37,7 +37,6 @@ func init() { // Flags from the auth package. flags.AddFlagSet(auth.GetLogoutFlags(&logoutOptions)) - logoutOptions.Stdin = os.Stdin logoutOptions.Stdout = os.Stdout logoutOptions.AcceptUnspecifiedRegistry = true } |