UPSTREAM: <carry>: hack out the oapi for restmapping resources when m…

…ore than one is present
openshift · Jan 31, 2018 · c29cfa3 · c29cfa3
1 parent c2aed8d
commit c29cfa3
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 0 deletions.
diff --git a/vendor/k8s.io/kubernetes/staging/src/k8s.io/apimachinery/pkg/api/meta/patch.go b/vendor/k8s.io/kubernetes/staging/src/k8s.io/apimachinery/pkg/api/meta/patch.go
diff --git a/vendor/k8s.io/kubernetes/staging/src/k8s.io/apimachinery/pkg/api/meta/priority.go b/vendor/k8s.io/kubernetes/staging/src/k8s.io/apimachinery/pkg/api/meta/priority.go