summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKubernetes Submit Queue <k8s-merge-robot@users.noreply.github.com>2017-11-07 18:35:32 -0800
committerGitHub <noreply@github.com>2017-11-07 18:35:32 -0800
commit28a20bf9bd963ec2bbe411b72611c2b0b14ee442 (patch)
tree036622aa46374d221848d59f553c43c66f20d7b2
parent0635db74e94a079ee04d4784499b6dd2706f49a9 (diff)
parent6362eee2eb7d794bb03e62715e3410a347a8e849 (diff)
Merge pull request #1356 from gin419/patch-5
Automatic merge from submit-queue. Update pod-resource-management.md
-rw-r--r--contributors/design-proposals/node/pod-resource-management.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/contributors/design-proposals/node/pod-resource-management.md b/contributors/design-proposals/node/pod-resource-management.md
index ee1e2ed3..94875d83 100644
--- a/contributors/design-proposals/node/pod-resource-management.md
+++ b/contributors/design-proposals/node/pod-resource-management.md
@@ -172,7 +172,7 @@ pod<UID>/cpu.shares = 2
## QoS level cgroups
The `kubelet` defines a `--cgroup-root` flag that is used to specify the `ROOT`
-node in the cgroup hierarchy below which the `kubelet` should manange individual
+node in the cgroup hierarchy below which the `kubelet` should manage individual
cgroup sandboxes. It is strongly recommended that users keep the default
value for `--cgroup-root` as `/` in order to avoid deep cgroup hierarchies. The
`kubelet` creates a cgroup sandbox under the specified path `ROOT/kubepods` per