Merge pull request #20392 from deads2k/oc-06-restmapper

UPSTREAM: 66249: fill in normal restmapping info with the legacy guess
openshift · Jul 26, 2018 · 0c4c2ad · 0c4c2ad
2 parents dbdc144 + ebb240b
commit 0c4c2ad
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 110 deletions.
diff --git a/vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/restmapper/discovery.go b/vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/restmapper/discovery.go
diff --git a/vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/restmapper/patch_restmapper_kind.go b/vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/restmapper/patch_restmapper_kind.go