k8s-merge-robot d2f5bbc0d7 Merge pull request #27742 from mml/fed-err-shadow ...

Automatic merge from submit-queue

Fix block-local err bug in service_helper.go

2016-06-20 23:33:40 -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 federation-name and zone-name flags to e2e test

2016-06-14 15:40:07 +08:00

pkg

Merge pull request #27742 from mml/fed-err-shadow

2016-06-20 23:33:40 -07:00

registry/cluster

Merge pull request #26132 from nikhiljindal/newmaster

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