k8s-merge-robot 3d162d0400 Merge pull request #29427 from justinsb/aws_master_os_distribution ...

Automatic merge from submit-queue

AWS kube-up: fix MASTER_OS_DISTRIBUTION

On AWS we were defining KUBE_MASTER_OS_DISTRIBUTION, but the scripts
expect MASTER_OS_DISTRIBUTION.

Fixes #29422

2016-07-22 15:35:20 -07:00

..

common

Remove "All rights reserved" from all the headers.

2016-06-29 17:47:36 -07:00

jessie

Remove "All rights reserved" from all the headers.

2016-06-29 17:47:36 -07:00

templates

AWS kube-up: export kube_user to salt

2016-07-22 00:46:03 -04:00

wily

Remove "All rights reserved" from all the headers.

2016-06-29 17:47:36 -07:00

config-default.sh

AWS kube-up: fix MASTER_OS_DISTRIBUTION

2016-07-22 00:45:05 -04:00

config-test.sh

AWS kube-up: fix MASTER_OS_DISTRIBUTION

2016-07-22 00:45:05 -04:00

options.md

Fixed several typos

2016-07-13 15:06:24 +01:00

util.sh

Remove "All rights reserved" from all the headers.

2016-06-29 17:47:36 -07:00