Skip to content

Commit

Permalink
Merge pull request kubernetes#27113 from AdoHe/automated-cherry-pick-…
Browse files Browse the repository at this point in the history
…of-#26418-upstream-release-1.2

Automated cherry pick of kubernetes#26418
  • Loading branch information
roberthbailey authored Jun 21, 2016
2 parents 0c240a6 + 67deeaa commit 00dcea5
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 @@ -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])
}
}

Expand Down

0 comments on commit 00dcea5

Please sign in to comment.