diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-07-31 14:06:37 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-31 14:06:37 -0400 |
| commit | 87955d8541e553567444b9f3cf2d09982fd9d419 (patch) | |
| tree | e7e04c86432f498b815c7b1327464680e4318f97 /cmd/podman/common/create_opts.go | |
| parent | b55a0ce42eb836b8d4a7091ea8bdd82e58f8352b (diff) | |
| parent | a9a55be991fa8f06cf266bd84a72589713a71ac9 (diff) | |
| download | podman-87955d8541e553567444b9f3cf2d09982fd9d419.tar.gz podman-87955d8541e553567444b9f3cf2d09982fd9d419.tar.bz2 podman-87955d8541e553567444b9f3cf2d09982fd9d419.zip | |
Merge pull request #7170 from mheon/204_backports
Extra backports for v2.0.4
Diffstat (limited to 'cmd/podman/common/create_opts.go')
| -rw-r--r-- | cmd/podman/common/create_opts.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd/podman/common/create_opts.go b/cmd/podman/common/create_opts.go index 08ffa5544..bb50df8c9 100644 --- a/cmd/podman/common/create_opts.go +++ b/cmd/podman/common/create_opts.go @@ -10,7 +10,7 @@ type ContainerCLIOpts struct { BlkIOWeightDevice []string CapAdd []string CapDrop []string - CGroupsNS string + CgroupNS string CGroupsMode string CGroupParent string CIDFile string |