whentimeslows/website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.6

Browse Source 
* 'master' of https://github.com/kubernetes/kubernetes.github.io:
  rephrase the expression of configmap/index.md
  Do not link to org/team links on GitHub
  Fixed typos (#2721)
  Revert "update init-containers.md"
  Fix doc sentence
  Add Minikube reference in the Kubectl configuration doc
  Mention Minikube in the Kubectl configuration doc

# Conflicts:
#	docs/tasks/index.md
This commit is contained in:
Andrew Chen
2017-03-22 13:39:24 -07:00
parent 431ed22c3d 2d77413f91
commit 31221c3a76
7 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/concepts/workloads/pods/init-containers.md
+1 -1
View File
@@ -223,7 +223,7 @@ validation error is thrown for any Container sharing a name with another.
### Resources
Given the ordering and execution for Init Containers, the following rules
for resource usage application:
for resource usage apply:
* The highest of any particular resource request or limit defined on all Init
Containers is the *effective init request/limit*