Skip to content

Commit db03c49

Browse files
Merge pull request #18331 from mfojtik/pick-57854
Automatic merge from submit-queue (batch tested with PRs 18225, 18351, 18331, 18340, 18326). UPSTREAM: 57854: fix bug of swallowing missing merge key error fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1529659
2 parents 1710344 + b2e9be7 commit db03c49

File tree

2 files changed

+27
-12
lines changed

2 files changed

+27
-12
lines changed

vendor/k8s.io/kubernetes/staging/src/k8s.io/apimachinery/pkg/util/strategicpatch/patch.go

Lines changed: 12 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/k8s.io/kubernetes/staging/src/k8s.io/apimachinery/pkg/util/strategicpatch/patch_test.go

Lines changed: 15 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)