Skip to content

Commit

Permalink
Fix incorrect link in api
Browse files Browse the repository at this point in the history
Kubernetes-commit: f50e0e7c50bf94bbe485f064eda82d3bc072d861
  • Loading branch information
huzhengchuan authored and k8s-publish-robot committed Sep 25, 2017
1 parent db7c0fd commit 3694633
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion pkg/util/strategicpatch/patch.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 3694633

Please sign in to comment.