Merge branch 'master' into master

This commit is contained in:
Aaron.L.Xu
2016-12-23 19:40:51 +08:00
committed by GitHub
54 changed files with 286 additions and 192 deletions
+1 -1
View File
@@ -159,7 +159,7 @@ reasons:
* This is uncommon and would have to be done by someone with root access to nodes.
* All containers in a pod are terminated, requiring a restart (RestartPolicyAlways) AND the record of init container completion has been lost due to garbage collection.
## Support and compatibilty
## Support and compatibility
A cluster with Kubelet and Apiserver version 1.4.0 or greater supports init
containers with the beta annotations. Support varies for other combinations of