Merge pull request #12860 from rhatdan/cgroups

Use CONTAINERS_CONF cgroups flag for remote API.

1 files changed, 6 insertions, 6 deletions

diff --git a/libpod/define/container_inspect.go b/libpod/define/container_inspect.go
index ba73e4196..6db1b025e 100644
--- a/libpod/define/container_inspect.go
+++ b/libpod/define/container_inspect.go
@@ -345,9 +345,9 @@ type InspectContainerHostConfig struct {
 	// populated.
 	// TODO.
 	Cgroup string `json:"Cgroup"`
-	// Cgroups contains the container's CGroup mode.
-	// Allowed values are "default" (container is creating CGroups) and
-	// "disabled" (container is not creating CGroups).
+	// Cgroups contains the container's Cgroup mode.
+	// Allowed values are "default" (container is creating Cgroups) and
+	// "disabled" (container is not creating Cgroups).
 	// This is Libpod-specific and not included in `docker inspect`.
 	Cgroups string `json:"Cgroups"`
 	// Links is unused, and provided purely for Docker compatibility.
@@ -417,7 +417,7 @@ type InspectContainerHostConfig struct {
 	Isolation string `json:"Isolation"`
 	// CpuShares indicates the CPU resources allocated to the container.
 	// It is a relative weight in the scheduler for assigning CPU time
-	// versus other CGroups.
+	// versus other Cgroups.
 	CpuShares uint64 `json:"CpuShares"`
 	// Memory indicates the memory resources allocated to the container.
 	// This is the limit (in bytes) of RAM the container may use.
@@ -434,12 +434,12 @@ type InspectContainerHostConfig struct {
 	// 100000, we will set both CpuQuota, CpuPeriod, and NanoCpus. If
 	// CpuQuota is not the default, we will not set NanoCpus.
 	NanoCpus int64 `json:"NanoCpus"`
-	// CgroupParent is the CGroup parent of the container.
+	// CgroupParent is the Cgroup parent of the container.
 	// Only set if not default.
 	CgroupParent string `json:"CgroupParent"`
 	// BlkioWeight indicates the I/O resources allocated to the container.
 	// It is a relative weight in the scheduler for assigning I/O time
-	// versus other CGroups.
+	// versus other Cgroups.
 	BlkioWeight uint16 `json:"BlkioWeight"`
 	// BlkioWeightDevice is an array of I/O resource priorities for
 	// individual device nodes.