Merge branch 'master' into fix-cm-link

This commit is contained in:
devin-donnelly
2016-12-21 17:04:26 -05:00
committed by GitHub
10 changed files with 23 additions and 14 deletions
+1 -1
View File
@@ -328,7 +328,7 @@ Host: k8s-master:8080
```
To consume opaque resources in pods, include the name of the opaque
resource as a key in the the `spec.containers[].resources.requests` map.
resource as a key in the `spec.containers[].resources.requests` map.
The pod will be scheduled only if all of the resource requests are
satisfied (including cpu, memory and any opaque resources.) The pod will