From 369463361cde70cf151a8298d418d8395b25580e Mon Sep 17 00:00:00 2001 From: zhengchuan hu Date: Mon, 25 Sep 2017 12:33:42 +0800 Subject: [PATCH] Fix incorrect link in api Kubernetes-commit: f50e0e7c50bf94bbe485f064eda82d3bc072d861 --- pkg/util/strategicpatch/patch.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/util/strategicpatch/patch.go b/pkg/util/strategicpatch/patch.go index 8884c738e..413f0a9ce 100644 --- a/pkg/util/strategicpatch/patch.go +++ b/pkg/util/strategicpatch/patch.go @@ -1054,7 +1054,7 @@ func applyRetainKeysDirective(original, patch map[string]interface{}, options Me // Then, sort them by the relative order in setElementOrder, patch list and live list. // The precedence is $setElementOrder > order in patch list > order in live list. // This function will delete the item after merging it to prevent process it again in the future. -// Ref: https://git.k8s.io/community/contributors/design-proposals/preserve-order-in-strategic-merge-patch.md +// Ref: https://git.k8s.io/community/contributors/design-proposals/cli/preserve-order-in-strategic-merge-patch.md func mergePatchIntoOriginal(original, patch map[string]interface{}, t reflect.Type, mergeOptions MergeOptions) error { for key, patchV := range patch { // Do nothing if there is no ordering directive