k8s-merge-robot 47bcf37198 Merge pull request #23045 from justinsb/aws_bump_image_20160316 ... Automatic merge from submit-queue AWS kube-up: Bump jessie image		2016-04-03 03:47:34 -07:00
..
coreos	docs: replace Rocket with rkt	2016-02-09 13:52:25 +01:00
jessie	AWS kube-up: Bump jessie image	2016-03-16 07:51:41 -04:00
templates	AWS: Don't error if there are no ephemeral disks	2016-04-01 22:27:20 -04:00
trusty	AWS: Pass non-masquerade-cidr through kube-up	2016-01-22 21:01:44 -05:00
vivid	AWS: Update AMIs for Ubuntu Vivid	2016-01-18 16:47:06 -05:00
wheezy	AWS: Log the region when we don't recognize it.	2015-10-27 10:18:52 -04:00
wily	AWS kube-up: Add support for wily	2016-02-17 10:45:21 -05:00
config-default.sh	Fix AWS default master sizes	2016-03-11 09:45:22 +01:00
config-test.sh	Merge pull request #22170 from metmajer/master	2016-03-04 10:40:17 -08:00
options.md	AWS: Set OS defaults for kube 1.2	2016-02-25 00:10:33 -05:00
util.sh	AWS kube-up: Allow BLOCK_DEVICE_MAPPINGS_BASE to be empty	2016-04-01 22:27:28 -04:00