diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-03-30 22:01:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-30 22:01:16 +0200 |
| commit | 9c7410d331ed6c9af50babb41314bfa67a3f39e0 (patch) | |
| tree | 3c80170c34677ae2247d9f3c86409c291532262e | |
| parent | edd623c4196f4b193387730f7989cfa108d634be (diff) | |
| parent | f7241b24e6bc6ab1cc1f12c7f86f64c80a63a949 (diff) | |
| download | podman-9c7410d331ed6c9af50babb41314bfa67a3f39e0.tar.gz podman-9c7410d331ed6c9af50babb41314bfa67a3f39e0.tar.bz2 podman-9c7410d331ed6c9af50babb41314bfa67a3f39e0.zip | |
Merge pull request #5669 from sshnaidm/cpushare
Revert "Default CPUShares in Inspect are 1024"
| -rw-r--r-- | libpod/container_inspect.go | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libpod/container_inspect.go b/libpod/container_inspect.go index f81be8b22..729a00be8 100644 --- a/libpod/container_inspect.go +++ b/libpod/container_inspect.go @@ -445,9 +445,6 @@ func (c *Container) generateInspectContainerHostConfig(ctrSpec *spec.Spec, named hostConfig.ShmSize = c.config.ShmSize hostConfig.Runtime = "oci" - // Default CPUShares is 1024, but we may overwrite below. - hostConfig.CpuShares = 1024 - // This is very expensive to initialize. // So we don't want to initialize it unless we absolutely have to - IE, // there are things that require a major:minor to path translation. |