kubernetes
/
website
mirror of https://github.com/kubernetes/website.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into pnovotnak/feat/volume-claim-exclusivity-and-namespacing

reviewable/pr1046/r1
Peter Novotnak 2016-08-17 15:03:21 -07:00 committed by GitHub
parent 5bc7de4f1d 27abe826cd
commit 65c0fffb2f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/user-guide/compute-resources.md
View File

@ -13,7 +13,7 @@ container needs. When containers have their resource requests specified, the sc
able to make better decisions about which nodes to place pods on; and when containers have their
limits specified, contention for resources on a node can be handled in a specified manner. For
more details about the difference between requests and limits, please refer to
[Resource QoS](https://github.com/kubernetes/kubernetes/blob/{{page.githubbranch}}/docs/proposals/resource-qos.md).
[Resource QoS](https://github.com/kubernetes/kubernetes/blob/{{page.githubbranch}}/docs/design/resource-qos.md).
*CPU* and *memory* are each a *resource type*. A resource type has a base unit. CPU is specified
in units of cores. Memory is specified in units of bytes.