summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKubernetes Submit Queue <k8s-merge-robot@users.noreply.github.com>2016-11-28 11:44:22 -0800
committerGitHub <noreply@github.com>2016-11-28 11:44:22 -0800
commit6fbd7a74a159dc83ca8eebf0f2b868fc6e09e7a9 (patch)
tree836a8e8c62200ecac123f45448fd785cd3ef51e5
parent65d90d68575fadcc5874b06e4e2fcc10fd15e7eb (diff)
parente66185b8628300bedfd68f7b886343a027acb44d (diff)
Merge pull request #34315 from seeekr/patch-1
Automatic merge from submit-queue fix typo in podaffinity.md
-rw-r--r--podaffinity.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/podaffinity.md b/podaffinity.md
index 4ff26fa0..9291b8b9 100644
--- a/podaffinity.md
+++ b/podaffinity.md
@@ -179,7 +179,7 @@ are satisfied for each node, and the node(s) with the highest weight(s) are the
most preferred.
In reality there are two variants of `RequiredDuringScheduling`: one suffixed
-with `RequiredDuringEecution` and one suffixed with `IgnoredDuringExecution`.
+with `RequiredDuringExecution` and one suffixed with `IgnoredDuringExecution`.
For the first variant, if the affinity/anti-affinity ceases to be met at some
point during pod execution (e.g. due to a pod label update), the system will try
to eventually evict the pod from its node. In the second variant, the system may