diff options
| author | k8s-merge-robot <k8s.production.user@gmail.com> | 2016-06-28 11:40:23 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-28 11:40:23 -0700 |
| commit | 0250aa051ab488cbfb6405060f12411f4722de0c (patch) | |
| tree | 054af9d9e2a89b11037c81b5ab3182aa20da7372 | |
| parent | 89e1b119d90546c8d2b0bedd7ad2ed7b59733f30 (diff) | |
| parent | 2b760742fe1ed3d25e0981e5481f7074b15facea (diff) | |
Merge pull request #26738 from aveshagarwal/master-resources-bytes-terminology
Automatic merge from submit-queue
Fix byte terminology
| -rw-r--r-- | downward_api_resources_limits_requests.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/downward_api_resources_limits_requests.md b/downward_api_resources_limits_requests.md index 1443173c..11d132bd 100644 --- a/downward_api_resources_limits_requests.md +++ b/downward_api_resources_limits_requests.md @@ -413,8 +413,8 @@ to specify the output format of values of exposed resources. The default value o is `1` which means cores for cpu and bytes for memory. For cpu, divisor's valid values are `1m` (millicores), `1`(cores), and for memory, the valid values in fixed point integer (decimal) are `1`(bytes), `1k`(kilobytes), `1M`(megabytes), `1G`(gigabytes), -`1T`(terabytes), `1P`(petabytes), `1E`(exabytes), and in their power-of-two equivalents `1Ki(kilobytes)`, -`1Mi`(megabytes), `1Gi`(gigabytes), `1Ti`(terabytes), `1Pi`(petabytes), `1Ei`(exabytes). +`1T`(terabytes), `1P`(petabytes), `1E`(exabytes), and in their power-of-two equivalents `1Ki(kibibytes)`, +`1Mi`(mebibytes), `1Gi`(gibibytes), `1Ti`(tebibytes), `1Pi`(pebibytes), `1Ei`(exbibytes). For more information about these resource formats, [see details](resources.md). Also, the exposed values will be `ceiling` of the actual values in the requestd format in divisor. |