summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKubernetes Submit Queue <k8s-merge-robot@users.noreply.github.com>2016-08-29 12:15:31 -0700
committerGitHub <noreply@github.com>2016-08-29 12:15:31 -0700
commitc2b71a06e7fae94b628cc16cd764ebdb53c32701 (patch)
tree97556132e7a24854e27ca708a4d4b0e958e6e7e1
parent233b226e432da33243789a6d215b17c91d8cd126 (diff)
parent2a7816da397f44ba56f638dede91ad9a07fe2f57 (diff)
Merge pull request #29287 from caitong93/patch-2
Automatic merge from submit-queue Fix a typo in resource-qos design doc
-rw-r--r--resource-qos.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/resource-qos.md b/resource-qos.md
index ef654cd7..f09f7e93 100644
--- a/resource-qos.md
+++ b/resource-qos.md
@@ -120,8 +120,8 @@ containers:
cpu: 100m
memory: 100Mi
requests:
- cpu: 10m
- memory: 1Gi
+ cpu: 100m
+ memory: 100Mi
```
- If `requests` and optionally `limits` are set (not equal to `0`) for one or more resources across one or more containers, and they are *not equal*, then the pod is classified as **Burstable**.