github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-11 22:20:18 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #21233 from justinsb/aws_wily

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-02-20 13:28:08 -08:00
parent 807344da0b 4d2c580781
commit a12a2e984a
5 changed files with 97 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cluster/aws/util.sh
View File

@@ -57,7 +57,7 @@ fi
OS_DISTRIBUTION=${KUBE_OS_DISTRIBUTION}
case "${KUBE_OS_DISTRIBUTION}" in
trusty|wheezy|jessie|vivid|coreos)
trusty|wheezy|jessie|vivid|wily|coreos)
source "${KUBE_ROOT}/cluster/aws/${KUBE_OS_DISTRIBUTION}/util.sh"
;;
*)
@@ -272,6 +272,9 @@ case "${KUBE_OS_DISTRIBUTION}" in
vivid)
detect-vivid-image
;;
wily)
detect-wily-image
;;
wheezy)
detect-wheezy-image
;;