k8s-merge-robot 085b172395 Merge pull request #24887 from nikhiljindal/runOptions ...

Automatic merge from submit-queue

Deleting duplicate code from federated-apiserver.Run()

This removes most of duplicate code from federated-apiserver.Run().
The code remaining is related to storage or authz and authn.
https://github.com/kubernetes/kubernetes/pull/24787 refactors the storage related code.
I am still figuring out authz and authn.

cc @jianhuiz

2016-05-05 06:50:56 -07:00

..

apis/federation

Strip side-effect imports from generated protobuf

2016-05-02 18:12:20 -04:00

client/clientset_generated

add import_known_version.go for federation clientset

2016-04-28 16:29:04 -07:00

cmd/federated-apiserver

Deleting duplicate code from federated-apiserver

2016-05-03 14:04:09 -07:00

registry/cluster

replace cluster phase with conditions

2016-04-26 02:06:47 -07:00