Skip to content

Commit 9690643

Browse files
committed
UPSTREAM: 57854: fix bug of swallowing missing merge key error
1 parent 4f709b4 commit 9690643

File tree

3 files changed

+103
-12
lines changed

3 files changed

+103
-12
lines changed

vendor/k8s.io/kubernetes/57854.patch

Lines changed: 76 additions & 0 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.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)