Merge branch 'master' into patch-1

This commit is contained in:
devin-donnelly
2016-12-22 18:31:04 -08:00
committed by GitHub
23 changed files with 26 additions and 27 deletions
+1 -1
View File
@@ -166,7 +166,7 @@ parallelism, for a variety or reasons:
- If the controller failed to create pods for any reason (lack of ResourceQuota, lack of permission, etc.),
then there may be fewer pods than requested.
- The controller may throttle new pod creation due to excessive previous pod failures in the same Job.
- When a pod is gracefully shutdown, it make take time to stop.
- When a pod is gracefully shutdown, it takes time to stop.
## Handling Pod and Container Failures