k8s-merge-robot c0e0e74728 Merge pull request #27278 from activars/aws_optional_dhcp_set_id ...

Automatic merge from submit-queue

Making DHCP_OPTION_SET_ID creation optional

Reason: We have a pre-configured VPC in AWS. `kube-up.sh` should not making changes to the VPC DHCP option if there's already DHCP options configured. 

PR Changes: When `DHCP_OPTION_SET_ID` is given in environment variable, kube-up.sh will skip the `DHCP_OPTION_SET_ID` creation.

2016-06-28 01:13:20 -07:00

..

common

AWS kube-up: remove support for vivid

2016-06-18 20:42:31 -04:00

jessie

AWS kube-up: point to new AMI; link to new tool

2016-06-18 20:42:31 -04:00

templates

AWS kube-up: Authorize route53 in the IAM policy

2016-06-21 15:42:54 -04:00

wily

AWS kube-up: remove support for vivid

2016-06-18 20:42:31 -04:00

config-default.sh

Merge pull request #24910 from paralin/aws-configurable-context

2016-06-24 13:09:40 -07:00

config-test.sh

Merge pull request #24910 from paralin/aws-configurable-context

2016-06-24 13:09:40 -07:00

options.md

AWS kube-up: remove support for vivid

2016-06-18 20:42:31 -04:00

util.sh

Merge pull request #27278 from activars/aws_optional_dhcp_set_id

2016-06-28 01:13:20 -07:00