Kubernetes Submit Queue 8da4d96839 Merge pull request #30112 from nikhiljindal/federationIngressAPI ...

Automatic merge from submit-queue

Adding ingress resource to federation apiserver

Fixes https://github.com/kubernetes/kubernetes/issues/29342

cc @kubernetes/sig-cluster-federation

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.kubernetes.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.kubernetes.io/reviews/kubernetes/kubernetes/30112)
<!-- Reviewable:end -->

2016-08-10 00:08:41 -07:00

..

app

Merge pull request #30112 from nikhiljindal/federationIngressAPI

2016-08-10 00:08:41 -07:00

apiserver.go

Merge pull request #29147 from caesarxuchao/cut-client-repo-staging

2016-08-09 17:12:14 -07:00

OWNERS

Renaming federated-apiserver to federation-apiserver

2016-05-24 11:49:39 -07:00