github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-14 14:23:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #26418 from AdoHe/kubectl_env

Browse Source 
Automatic merge from submit-queue

fix strategy patch diff list issue

fixes #25585 

@janetkuo @pwittrock ptal.
This commit is contained in:
k8s-merge-robot 2016-05-29 18:18:14 -07:00
commit 195842713d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/util/strategicpatch/patch.go
View File

@ -432,7 +432,7 @@ loopB:
if !ignoreChangesAndAdditions {
// Add any remaining items found only in modified
for ; modifiedIndex < len(modifiedSorted); modifiedIndex++ {
patch = append(patch, modified[modifiedIndex])
patch = append(patch, modifiedSorted[modifiedIndex])
}
}