diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-10-30 18:22:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-30 18:22:47 +0100 |
| commit | 37b550c96aeef9d6d248183bab328f6bfe5f4d5b (patch) | |
| tree | ed9d4870f2d588437d8b529a2cfa4e79e1f64afd | |
| parent | 5eebe3dd3d99a3e80d52e991bb4e133a00b7272b (diff) | |
| parent | 433fea303e634096f6576ad37423db82d46e28bb (diff) | |
| download | podman-37b550c96aeef9d6d248183bab328f6bfe5f4d5b.tar.gz podman-37b550c96aeef9d6d248183bab328f6bfe5f4d5b.tar.bz2 podman-37b550c96aeef9d6d248183bab328f6bfe5f4d5b.zip | |
Merge pull request #8196 from giuseppe/specgen-swap-limit-err-message
specgen: fix error message
| -rw-r--r-- | pkg/specgen/generate/validate.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/specgen/generate/validate.go b/pkg/specgen/generate/validate.go index ed337321b..f7d80ff75 100644 --- a/pkg/specgen/generate/validate.go +++ b/pkg/specgen/generate/validate.go @@ -38,7 +38,7 @@ func verifyContainerResources(s *specgen.SpecGenerator) ([]string, error) { memory.Swap = nil } if memory.Limit != nil && memory.Swap != nil && !sysInfo.SwapLimit { - warnings = append(warnings, "Your kernel does not support swap limit capabilities,or the cgroup is not mounted. Memory limited without swap.") + warnings = append(warnings, "Your kernel does not support swap limit capabilities or the cgroup is not mounted. Memory limited without swap.") memory.Swap = nil } if memory.Limit != nil && memory.Swap != nil && *memory.Swap < *memory.Limit { |