diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-04-13 21:57:39 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-13 21:57:39 +0200 |
commit | 0b067b67e6fa9e7ce8c1b460f5347c8ae89d1ecb (patch) | |
tree | 6d777c6e7bf9d542633a936a0bb03decceaeaaa8 /pkg/specgen/pod_validate.go | |
parent | d7695dd957b162ed24c807dc91200fe1abaecff1 (diff) | |
parent | 90ead05903e9c42758c1052c2ee623dca8de5e98 (diff) | |
download | podman-0b067b67e6fa9e7ce8c1b460f5347c8ae89d1ecb.tar.gz podman-0b067b67e6fa9e7ce8c1b460f5347c8ae89d1ecb.tar.bz2 podman-0b067b67e6fa9e7ce8c1b460f5347c8ae89d1ecb.zip |
Merge pull request #5800 from baude/v2edtests
Fixes for load and other system tests
Diffstat (limited to 'pkg/specgen/pod_validate.go')
-rw-r--r-- | pkg/specgen/pod_validate.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/specgen/pod_validate.go b/pkg/specgen/pod_validate.go index 50309f096..92026309f 100644 --- a/pkg/specgen/pod_validate.go +++ b/pkg/specgen/pod_validate.go @@ -25,7 +25,7 @@ func (p *PodSpecGenerator) validate() error { return exclusivePodOptions("NoInfra", "InfraImage") } if len(p.SharedNamespaces) > 0 { - return exclusivePodOptions("NoInfo", "SharedNamespaces") + return exclusivePodOptions("NoInfra", "SharedNamespaces") } } |