Skip to content

Commit

Permalink
Merge pull request kubernetes#1492 from jbeda/backports-fix
Browse files Browse the repository at this point in the history
Change back to generic image description now that GCE is fixed.
  • Loading branch information
jbeda committed Sep 29, 2014
2 parents 16a26a4 + 7cadeb2 commit 648a400
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion cluster/gce/config-default.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ MASTER_SIZE=g1-small
MINION_SIZE=g1-small
NUM_MINIONS=4
# gcloud/gcutil will expand this to the latest supported image.
IMAGE=projects/debian-cloud/global/images/backports-debian-7-wheezy-v20140924
IMAGE=backports-debian-7-wheezy
NETWORK=default
INSTANCE_PREFIX=kubernetes
MASTER_NAME="${INSTANCE_PREFIX}-master"
Expand Down
2 changes: 1 addition & 1 deletion cluster/gce/config-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ MASTER_SIZE=g1-small
MINION_SIZE=g1-small
NUM_MINIONS=2
# gcloud/gcutil will expand this to the latest supported image.
IMAGE=projects/debian-cloud/global/images/backports-debian-7-wheezy-v20140924
IMAGE=backports-debian-7-wheezy
NETWORK=e2e
INSTANCE_PREFIX="e2e-test-${USER}"
MASTER_NAME="${INSTANCE_PREFIX}-master"
Expand Down

0 comments on commit 648a400

Please sign in to comment.