diff options
| author | k8s-ci-robot <k8s-ci-robot@users.noreply.github.com> | 2018-02-10 21:39:50 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-10 21:39:50 -0800 |
| commit | e2a648ecf0dbe826de6b6f2e27e02d5599867725 (patch) | |
| tree | 725fc0acfc8809653c6316e3406d441a3c094d19 | |
| parent | 6929bc7fb3e95950503c438a8cfbf6914b1c00ad (diff) | |
| parent | 3d0b86312288a88c74e832cec3816d98daf04262 (diff) | |
Merge pull request #1787 from lijianfeng1993/fix_duplication_problem_1
fix a duplication problem in resource-quota-scoping.md
| -rw-r--r-- | contributors/design-proposals/resource-management/resource-quota-scoping.md | 2 | ||||
| -rw-r--r-- | contributors/design-proposals/scheduling/rescheduling.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/contributors/design-proposals/resource-management/resource-quota-scoping.md b/contributors/design-proposals/resource-management/resource-quota-scoping.md index edc6ed32..a6f3f947 100644 --- a/contributors/design-proposals/resource-management/resource-quota-scoping.md +++ b/contributors/design-proposals/resource-management/resource-quota-scoping.md @@ -197,7 +197,7 @@ For example, a quota could do the following: Theoretically, it would enable support for fine-grained tracking on a variety of resource types. While extremely flexible, there -are cons to to this approach that make it premature to pursue +are cons to this approach that make it premature to pursue at this time. * Generic field selectors are not yet settled art diff --git a/contributors/design-proposals/scheduling/rescheduling.md b/contributors/design-proposals/scheduling/rescheduling.md index b812599c..db960934 100644 --- a/contributors/design-proposals/scheduling/rescheduling.md +++ b/contributors/design-proposals/scheduling/rescheduling.md @@ -363,7 +363,7 @@ graceful termination period assuming all pods that are in their graceful termination period are gone and that all pods that are in the waiting state (see (4)) are running. 4. If (3) fails, then the new pod is rejected. If (3) passes, then Kubelet holds the -new pod in a waiting state, and does not run it until the pod passes passes the +new pod in a waiting state, and does not run it until the pod passes the admission checks using the set of actually running pods. Note that there are a lot of details to be figured out here; above is just a very |