Changes

Summary

node, syscontainer: export CNI plugins to the host when present (commit: 8e9cc1b) (details)
patch SC roles (commit: d4bbae0) (details)
UPSTREAM: revert: 7fc9d38a7a: <drop>: drop post 3.7 rebase. allows (commit: 8cd4a06) (details)
UPSTREAM: revert: fbf1f04: <drop>: disable openapi aggregation" (commit: 3aef22f) (details)
UPSTREAM: emicklei/go-restful-swagger12: <carry>: shim to allow multiple (commit: b6258f7) (details)
UPSTREAM: 00000: allow nil openapispec (commit: 1ad647c) (details)
UPSTREAM: <drop>: allow duplicate openapi paths. this is moved in 1.8 (commit: b27f637) (details)
UPSTREAM: <drop>: don't hold API server start on superslow openapi (commit: 9295035) (details)
UPSTREAM: <drop>: aggregate openapi through servers. 1.8 should fix (commit: 272c158) (details)
separate kube and openshift (commit: 00ddf8b) (details)
Retry build status update on non-conflict error (commit: 8372634) (details)

Commit 8e9cc1b7d7f7749461374b9486cadb9b286b328e by Giuseppe Scrivano node, syscontainer: export CNI plugins to the host when present We need to do this so that they can be used with CRI-O. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com> (commit: 8e9cc1b)
	images/node/Dockerfile (diff)
	images/node/Dockerfile.centos7 (diff)
Commit d4bbae0a4ceb8b5e7cf0362b2ed050dad61c017f by Ben Parees patch SC roles (commit: d4bbae0)
	pkg/oc/bootstrap/docker/openshift/util.go (diff)
	pkg/oc/bootstrap/docker/openshift/logging.go (diff)
	pkg/oc/bootstrap/docker/openshift/servicecatalog.go (diff)
Commit 8cd4a060ced437f0c26f290524ff45c5f99ee970 by David Eads UPSTREAM: revert: 7fc9d38a7a: <drop>: drop post 3.7 rebase. allows disabled aggregator This reverts commit 7fc9d38a7a1922df4465d0134e8fbe51ea0a557d. (commit: 8cd4a06)
	vendor/k8s.io/kubernetes/staging/src/k8s.io/apiserver/pkg/server/drop_patch.go
Commit 3aef22f8282112a59f8fd85495e198ff8f0bdab4 by David Eads UPSTREAM: revert: fbf1f04: <drop>: disable openapi aggregation" This reverts commit fbf1f04cf74e2318da61cc0e5da2917231aa1473. (commit: 3aef22f)
	vendor/k8s.io/kubernetes/staging/src/k8s.io/kube-aggregator/pkg/apiserver/apiserver.go (diff)
Commit b6258f7600d9efdb03789e68025a48b986bb5c7c by David Eads UPSTREAM: emicklei/go-restful-swagger12: <carry>: shim to allow multiple containers to union for swagger (commit: b6258f7)
	vendor/github.com/emicklei/go-restful-swagger12/swagger_webservice.go (diff)
Commit 1ad647cf54f994ace878590521da588b13764ffd by David Eads UPSTREAM: 00000: allow nil openapispec (commit: 1ad647c)
	vendor/k8s.io/kubernetes/staging/src/k8s.io/apiserver/pkg/server/genericapiserver.go (diff)
	vendor/k8s.io/kubernetes/staging/src/k8s.io/kube-aggregator/pkg/apiserver/apiserver.go (diff)
Commit b27f6377b0cdd670fd626f90bb7828ce4fb54b93 by David Eads UPSTREAM: <drop>: allow duplicate openapi paths. this is moved in 1.8 (commit: b27f637)
	vendor/k8s.io/kubernetes/staging/src/k8s.io/apiserver/pkg/server/openapi/openapi_aggregator.go (diff)
Commit 92950355af77491186e72a06b1e5da5ce2ea9d4c by David Eads UPSTREAM: <drop>: don't hold API server start on superslow openapi aggregation. Should be baster in 1.8 (commit: 9295035)
	vendor/k8s.io/kubernetes/staging/src/k8s.io/apiserver/pkg/server/openapi/openapi_handler.go (diff)
Commit 272c158b95030e8debd17b04f92fcfddeb462a17 by David Eads UPSTREAM: <drop>: aggregate openapi through servers. 1.8 should fix this for CRD (commit: 272c158)
	vendor/k8s.io/kubernetes/staging/src/k8s.io/kube-aggregator/pkg/apiserver/apiserver.go (diff)
	vendor/k8s.io/kubernetes/staging/src/k8s.io/apiserver/pkg/server/genericapiserver.go (diff)
	vendor/k8s.io/kubernetes/staging/src/k8s.io/apiserver/pkg/server/routes/swagger.go (diff)
	vendor/k8s.io/kubernetes/staging/src/k8s.io/apiserver/pkg/server/config.go (diff)
Commit 00ddf8b5060abc4a26d08c101fbd9b24162847db by David Eads separate kube and openshift (commit: 00ddf8b)
	pkg/cmd/server/origin/openshift_apiserver.go (diff)
	pkg/cmd/server/origin/master.go (diff)
	pkg/cmd/util/clientcmd/factory_object_mapping.go (diff)
Commit 8372634ea67238dbd1739eaa96c3aef878dffe86 by Corey Daley Retry build status update on non-conflict error Fixes 15152 (commit: 8372634)
	pkg/build/builder/common.go (diff)