summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKubernetes Submit Queue <k8s-merge-robot@users.noreply.github.com>2017-11-21 04:58:00 -0800
committerGitHub <noreply@github.com>2017-11-21 04:58:00 -0800
commite0a760e8fef5666bf5c96463dafacf7b2ac3980c (patch)
treec89d105011544c831d743d01b300aa8e6d1e19c3
parent29b7bddb830dca3b78e3ed3879b792e6ef7f36ef (diff)
parentf966ecd94cdbed7a3292a36a7500b81687e0fb63 (diff)
Merge pull request #1396 from phinoceslee/patch-6
Automatic merge from submit-queue. Update add-new-patchStrategy-to-clear-fields-not-present-in-patch.md
-rw-r--r--contributors/design-proposals/api-machinery/add-new-patchStrategy-to-clear-fields-not-present-in-patch.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/contributors/design-proposals/api-machinery/add-new-patchStrategy-to-clear-fields-not-present-in-patch.md b/contributors/design-proposals/api-machinery/add-new-patchStrategy-to-clear-fields-not-present-in-patch.md
index 2a9f660b..866ffb81 100644
--- a/contributors/design-proposals/api-machinery/add-new-patchStrategy-to-clear-fields-not-present-in-patch.md
+++ b/contributors/design-proposals/api-machinery/add-new-patchStrategy-to-clear-fields-not-present-in-patch.md
@@ -299,7 +299,7 @@ Each field present in the request will be merged with the live config.
There are 2 reasons of avoiding this logic:
- Using `$patch` as directive key will break backward compatibility.
-But can easily fixed by using a different key, e.g. `retainKeys: true`.
+But can easily be fixed by using a different key, e.g. `retainKeys: true`.
Reason is that `$patch` has been used in earlier releases.
If we add new value to this directive,
the old server will reject the new patch due to not knowing the new value.