k8s-merge-robot c5afca10f4 Merge pull request #27748 from mfanjie/service-controller ...

Automatic merge from submit-queue

Federation: Improve the handling of service deletion in underlying clusters

fixes #27623 

[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()

2016-06-22 16:21:16 -07:00

..

apis

load secretRef only if it is present

2016-05-31 18:17:42 -07:00

client

change clientset of service controller to versioned one

2016-06-06 17:04:26 +08:00

cluster

Updating the code to fix the context name before using it as secret and cluster names

2016-06-20 14:50:28 -07:00

cmd

Log version info at start.

2016-06-20 16:43:48 -07:00

manifests

Add ssl certs to federation-controller-manager container.

2016-06-21 14:06:32 -07:00

pkg

Merge pull request #27748 from mfanjie/service-controller

2016-06-22 16:21:16 -07:00

registry/cluster

Merge pull request #26132 from nikhiljindal/newmaster

2016-05-27 08:31:58 -07:00