UPSTREAM: 57854: fix bug of swallowing missing merge key error

openshift · Jan 29, 2018 · b2e9be7 · b2e9be7
1 parent 4f709b4
commit b2e9be7
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 12 deletions.
diff --git a/vendor/k8s.io/kubernetes/staging/src/k8s.io/apimachinery/pkg/util/strategicpatch/patch.go b/vendor/k8s.io/kubernetes/staging/src/k8s.io/apimachinery/pkg/util/strategicpatch/patch.go
diff --git a/...r/k8s.io/kubernetes/staging/src/k8s.io/apimachinery/pkg/util/strategicpatch/patch_test.go b/...r/k8s.io/kubernetes/staging/src/k8s.io/apimachinery/pkg/util/strategicpatch/patch_test.go