Merge pull request openshift#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
shitizbansal · Jan 31, 2018 · db03c49 · db03c49
2 parents 1710344 + b2e9be7
commit db03c49
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