summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKubernetes Submit Queue <k8s-merge-robot@users.noreply.github.com>2017-11-03 11:29:25 -0700
committerGitHub <noreply@github.com>2017-11-03 11:29:25 -0700
commitfc6d901b9302e528ecc5d3cdab7aa8f31f7cddb8 (patch)
treee3924bb8967c8ad5adca29160c2ba6aa8b4f6f06
parent43c5ead3910fddc116fb95be49877a0d3dba7ab9 (diff)
parent42822a3aa232b7bddbd27e965708d69c5ba9f37e (diff)
Merge pull request #1329 from chenhonggc/preserve-order-in-strategic-merge-patch
Automatic merge from submit-queue. change preserve-order-in-strategic-merge-patch.md I think `convered ` should be `covered `.
-rw-r--r--contributors/design-proposals/cli/preserve-order-in-strategic-merge-patch.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/contributors/design-proposals/cli/preserve-order-in-strategic-merge-patch.md b/contributors/design-proposals/cli/preserve-order-in-strategic-merge-patch.md
index 9fec6f0f..5e9644a6 100644
--- a/contributors/design-proposals/cli/preserve-order-in-strategic-merge-patch.md
+++ b/contributors/design-proposals/cli/preserve-order-in-strategic-merge-patch.md
@@ -4,7 +4,7 @@ Author: @mengqiy
## Motivation
-Background of the Strategic Merge Patch is convered [here](../devel/strategic-merge-patch.md).
+Background of the Strategic Merge Patch is covered [here](../devel/strategic-merge-patch.md).
The Kubernetes API may apply semantic meaning to the ordering of items within a list,
however the strategic merge patch does not keeping the ordering of elements.