Skip to content
This repository has been archived by the owner on Apr 17, 2019. It is now read-only.

Commit

Permalink
Merge pull request #1551 from mwielgus/tmp-hack
Browse files Browse the repository at this point in the history 
Automatic merge from submit-queue

Temporarily bring bring back workaround agains changed gce config format.

It was accidentally removed by #1399. 

cc: @fgrzadkowski @piosz @jszczepkowski

<!-- 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/contrib/1551)
<!-- Reviewable:end -->
  • Loading branch information
Kubernetes Submit Queue committed Aug 17, 2016
2 parents 7ef2e87 + 9ddbe2e commit 354eaf6
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions cluster-autoscaler/vendor/k8s.io/kubernetes/pkg/cloudprovider/providers/gce/gce.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 354eaf6

Please sign in to comment.