Merge pull request #11369 from jsafrane/pick-gce-zones

Merged by openshift-bot
openshift · Oct 19, 2016 · ab7d5fe · ab7d5fe
2 parents 3bc0437 + 0c02b73
commit ab7d5fe
Showing 1 changed file with 16 additions and 2 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/cloudprovider/providers/gce/gce.go b/vendor/k8s.io/kubernetes/pkg/cloudprovider/providers/gce/gce.go