UPSTREAM: <carry>: allow multiple containers to union for swagger

openshift · Nov 20, 2017 · c8ea17a · c8ea17a
1 parent 085c81a
commit c8ea17a
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 6 deletions.
diff --git a/vendor/k8s.io/kubernetes/staging/src/k8s.io/apiserver/pkg/server/config.go b/vendor/k8s.io/kubernetes/staging/src/k8s.io/apiserver/pkg/server/config.go
diff --git a/vendor/k8s.io/kubernetes/staging/src/k8s.io/apiserver/pkg/server/genericapiserver.go b/vendor/k8s.io/kubernetes/staging/src/k8s.io/apiserver/pkg/server/genericapiserver.go
diff --git a/vendor/k8s.io/kubernetes/staging/src/k8s.io/apiserver/pkg/server/routes/swagger.go b/vendor/k8s.io/kubernetes/staging/src/k8s.io/apiserver/pkg/server/routes/swagger.go