Merge pull request #2739 from devin-donnelly/release-1.6

Merge latest from Master into Release 1.6
kubernetes · Mar 8, 2017 · 6f9b0d9 · 6f9b0d9
2 parents 3e81720 + 621465a
commit 6f9b0d9
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/cn/docs/.gitkeep b/cn/docs/.gitkeep
diff --git a/docs/admin/garbage-collection.md b/docs/admin/garbage-collection.md
@@ -72,4 +72,4 @@ Including:
 | `--low-diskspace-threshold-mb` | `--eviction-hard` or `eviction-soft` | eviction generalizes disk thresholds to other resources |
 | `--outofdisk-transition-frequency` | `--eviction-pressure-transition-period` | eviction generalizes disk pressure transition to other resources |
 
-See [kubelet eviction design doc](https://github.com/kubernetes/kubernetes.github.io/blob/master/docs/admin/out-of-resource.md) for more details.
+See [Configuring Out Of Resource Handling](/docs/admin/out-of-resource/) for more details.
diff --git a/docs/admin/out-of-resource.md b/docs/admin/out-of-resource.md
@@ -17,8 +17,7 @@ If either resource is exhausted, the node would become unstable.
 
 ## Eviction Policy
 
-The `kubelet` can pro-actively monitor for and prevent against total starvation of a compute resource.  In
-cases where it could appear to occur, the `kubelet` can pro-actively fail one or more pods in order to reclaim
+The `kubelet` can pro-actively monitor for and prevent against total starvation of a compute resource.  In those cases, the `kubelet` can pro-actively fail one or more pods in order to reclaim
 the starved resource.  When the `kubelet` fails a pod, it terminates all containers in the pod, and the `PodPhase`
 is transitioned to `Failed`.