1. UPSTREAM: <drop>: Fix result type in fake clientset generator (commit: c1e422f) (details)
  2. regenerate fake deploymentconfig (commit: 30b40b8) (details)
  3. apps: use generate clientset in controllers and api server (commit: f11ddbf) (details)
  4. add network apiserver (commit: c6dbec9) (details)
  5. Lazily initialize Osin client for token endpoint (commit: 88c69eb) (details)
Commit c1e422f897a8c56535a26e1c99476a334653b6c2 by Michal Fojtik
UPSTREAM: <drop>: Fix result type in fake clientset generator
(commit: c1e422f)
The file was modifiedvendor/ (diff)
Commit 30b40b8930c6c3d3da3e4de7df2cd757148e6844 by Michal Fojtik
regenerate fake deploymentconfig
(commit: 30b40b8)
The file was modifiedpkg/deploy/generated/internalclientset/typed/apps/internalversion/fake/fake_deploymentconfig.go (diff)
The file was modifiedpkg/deploy/generated/clientset/typed/apps/v1/fake/fake_deploymentconfig.go (diff)
Commit f11ddbfe02acb5798080e88e919de47eacaed67e by Michal Fojtik
apps: use generate clientset in controllers and api server
(commit: f11ddbf)
The file was modifiedpkg/deploy/controller/deploymentconfig/factory.go (diff)
The file was modifiedpkg/cmd/server/origin/controller/apps.go (diff)
The file was modifiedpkg/deploy/apiserver/apiserver.go (diff)
The file was modifiedpkg/deploy/strategy/support/lifecycle.go (diff)
The file was modifiedpkg/deploy/registry/deploylog/rest_test.go (diff)
The file was modifiedpkg/deploy/controller/generictrigger/deploy_generictrigger_controller.go (diff)
The file was modifiedpkg/deploy/registry/rollback/rest.go (diff)
The file was modifiedpkg/deploy/registry/rollback/rest_test.go (diff)
The file was modifiedpkg/deploy/registry/deploylog/rest.go (diff)
The file was modifiedpkg/deploy/strategy/recreate/recreate.go (diff)
The file was modifiedtest/integration/imagestream_test.go (diff)
The file was modifiedpkg/deploy/controller/generictrigger/deploy_generictrigger_controller_test.go (diff)
The file was modifiedpkg/deploy/controller/generictrigger/factory.go (diff)
The file was modifiedtest/util/client.go (diff)
The file was modifiedpkg/deploy/controller/deploymentconfig/deploymentconfig_controller.go (diff)
The file was modifiedpkg/cmd/server/origin/controller/interfaces.go (diff)
The file was modifiedpkg/cmd/server/origin/controller/template.go (diff)
The file was modifiedpkg/deploy/controller/deploymentconfig/deploymentconfig_controller_test.go (diff)
The file was modifiedpkg/deploy/registry/instantiate/rest.go (diff)
The file was modifiedpkg/cmd/server/origin/controller/image.go (diff)
The file was modifiedpkg/cmd/infra/deployer/deployer.go (diff)
The file was modifiedpkg/deploy/registry/instantiate/rest_test.go (diff)
The file was modifiedpkg/deploy/strategy/rolling/rolling.go (diff)
The file was modifiedpkg/cmd/server/origin/openshift_apiserver.go (diff)
The file was modifiedpkg/cmd/server/origin/storage.go (diff)
The file was addedpkg/network/apiserver/apiserver.go
Commit 88c69ebcf193a693f01e6eba2768b5555637b8c4 by Mo Khan
Lazily initialize Osin client for token endpoint
This change makes it so that the Osin OAuth client for the token request
endpoint is lazily initialized when the endpoint is called. Initializing
in this case refers to fetching the private OpenShift browser OAuth
client from the API to get its secret (it is required to build the Osin
client).  This behavior was lost when we moved away from using the OAuth
Signed-off-by: Monis Khan <>
(commit: 88c69eb)
The file was modifiedpkg/oauth/apiserver/auth.go (diff)
The file was modifiedtest/util/server/server.go (diff)
The file was modifiedpkg/auth/server/tokenrequest/endpoints.go (diff)