Alex Robinson 
							
						 
					 
					
						
						
							
						
						cbcc25802e 
					 
					
						
						
							
							Merge pull request  #21237  from justinsb/aws_jessie_support  
						
						 
						
						... 
						
						
						
						AWS Debian Jessie Support 
						
						
					 
					
						2016-02-24 14:34:48 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Robinson 
							
						 
					 
					
						
						
							
						
						af93275f13 
					 
					
						
						
							
							Merge pull request  #21482  from chrisleck/cle-sub-second-fluentd  
						
						 
						
						... 
						
						
						
						Enable fluentd to parse the sub-second portion of timestamps coming from docker logs 
						
						
					 
					
						2016-02-24 13:52:30 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Justin Santa Barbara 
							
						 
					 
					
						
						
							
						
						5d7ed4d6e7 
					 
					
						
						
							
							AWS kube-up: Stop docker before moving /mnt/docker  
						
						 
						
						... 
						
						
						
						On Jessie, we now preinstall Docker.  Before moving /mnt/docker, make
sure we stop the docker service. 
						
						
					 
					
						2016-02-24 15:01:20 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Justin Santa Barbara 
							
						 
					 
					
						
						
							
						
						7f3bbe1dfe 
					 
					
						
						
							
							AWS kube-up: Bump to the latest Jessie image, allow overriding  
						
						 
						
						... 
						
						
						
						Jessie image can be selected by name using AWS_IMAGE_NAME. This is a
little easier than specifying the AMI ID. 
						
						
					 
					
						2016-02-24 14:34:40 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Justin Santa Barbara 
							
						 
					 
					
						
						
							
						
						41e2a4b0c3 
					 
					
						
						
							
							AWS Jessie image: preinstall docker 1.9.1  
						
						 
						
						... 
						
						
						
						Given the problems with docker's installation, we should be baking it
into the image. 
						
						
					 
					
						2016-02-24 14:24:03 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								k8s-merge-robot 
							
						 
					 
					
						
						
							
						
						8f3d7110d5 
					 
					
						
						
							
							Merge pull request  #21466  from mwielgus/heapster-alpha7  
						
						 
						
						... 
						
						
						
						Auto commit by PR queue bot 
						
						
					 
					
						2016-02-24 05:41:36 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								k8s-merge-robot 
							
						 
					 
					
						
						
							
						
						58783bc256 
					 
					
						
						
							
							Merge pull request  #21684  from justinsb/fix_21200  
						
						 
						
						... 
						
						
						
						Auto commit by PR queue bot 
						
						
					 
					
						2016-02-23 07:06:08 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Justin Santa Barbara 
							
						 
					 
					
						
						
							
						
						aa57beb885 
					 
					
						
						
							
							AWS Jessie: Find image by name  
						
						 
						
						... 
						
						
						
						This means we don't have to code the AMI ids for each region. 
						
						
					 
					
						2016-02-23 00:02:54 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Justin Santa Barbara 
							
						 
					 
					
						
						
							
						
						977a4a56e4 
					 
					
						
						
							
							AWS Debian Jessie: Install Docker 1.9.1  
						
						 
						
						
						
						
					 
					
						2016-02-22 22:55:11 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Justin Santa Barbara 
							
						 
					 
					
						
						
							
						
						91eb370931 
					 
					
						
						
							
							AWS Debian: Only install linux-image-extra on Ubuntu  
						
						 
						
						... 
						
						
						
						It isn't available (and hopefully not needed) on Debian 
						
						
					 
					
						2016-02-22 22:54:41 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prashanth B 
							
						 
					 
					
						
						
							
						
						c833a14898 
					 
					
						
						
							
							Merge pull request  #21727  from dchen1107/test  
						
						 
						
						... 
						
						
						
						Remove potential corrupted docker network checkpoint file before star… 
						
						
					 
					
						2016-02-22 17:52:16 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Dawn Chen 
							
						 
					 
					
						
						
							
						
						d922ddef8c 
					 
					
						
						
							
							Remove potential corrupted docker network checkpoint file before start docker  
						
						 
						
						... 
						
						
						
						again. 
						
						
					 
					
						2016-02-22 17:08:31 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								k8s-merge-robot 
							
						 
					 
					
						
						
							
						
						789fd731d2 
					 
					
						
						
							
							Merge pull request  #21686  from justinsb/aws_kubeup_build_config_early  
						
						 
						
						... 
						
						
						
						Auto commit by PR queue bot 
						
						
					 
					
						2016-02-22 16:16:53 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								k8s-merge-robot 
							
						 
					 
					
						
						
							
						
						8afccef608 
					 
					
						
						
							
							Merge pull request  #21632  from justinsb/docker_191  
						
						 
						
						... 
						
						
						
						Auto commit by PR queue bot 
						
						
					 
					
						2016-02-22 16:16:51 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeff Lowdermilk 
							
						 
					 
					
						
						
							
						
						c406665b2b 
					 
					
						
						
							
							Plumb node labels through salt  
						
						 
						
						... 
						
						
						
						Expose node-labels flag on kubelet for gce via a startup script
env var. 
						
						
					 
					
						2016-02-22 15:31:34 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Dawn Chen 
							
						 
					 
					
						
						
							
						
						699c80b752 
					 
					
						
						
							
							Merge pull request  #21641  from bprashanth/promisc  
						
						 
						
						... 
						
						
						
						Teach the kubelet about promiscuous mode, take 2 
						
						
					 
					
						2016-02-22 15:08:18 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Dawn Chen 
							
						 
					 
					
						
						
							
						
						201d60b426 
					 
					
						
						
							
							Merge pull request  #21440  from bprashanth/glbc_name  
						
						 
						
						... 
						
						
						
						Add image version to glbc name. 
						
						
					 
					
						2016-02-22 14:48:48 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Dawn Chen 
							
						 
					 
					
						
						
							
						
						b58826292a 
					 
					
						
						
							
							Merge pull request  #21703  from dchen1107/test  
						
						 
						
						... 
						
						
						
						Make sure docker is properly shutdown before startup. 
						
						
					 
					
						2016-02-22 13:35:24 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Dawn Chen 
							
						 
					 
					
						
						
							
						
						6c5f07d58e 
					 
					
						
						
							
							Make sure docker is properly shutdown before startup.  
						
						 
						
						
						
						
					 
					
						2016-02-22 12:57:42 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								k8s-merge-robot 
							
						 
					 
					
						
						
							
						
						347a509744 
					 
					
						
						
							
							Merge pull request  #21226  from justinsb/aws_jessie_image  
						
						 
						
						... 
						
						
						
						Auto commit by PR queue bot 
						
						
					 
					
						2016-02-22 11:04:49 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Justin Santa Barbara 
							
						 
					 
					
						
						
							
						
						f117b26c07 
					 
					
						
						
							
							AWS: Template for jessie image  
						
						 
						
						... 
						
						
						
						Based on the official debian image, with the following changes:
* Switched extlinux -> grub, because we need to change kernel options
to enable the memory cgroup controller, and extlinux is harder and has
reboot problems
* Added packages that would otherwise be installed as part of the boot
(just an optimization)
* Also add the cloud-initramfs-growroot package; with it the root
volume will resize.
* We add panic=10 & oops=panic to kernel options
* We install the packages as per the base image, except we install
  awscli from pip, because the repo version is really old. 
						
						
					 
					
						2016-02-22 12:47:34 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Justin Santa Barbara 
							
						 
					 
					
						
						
							
						
						050863cf93 
					 
					
						
						
							
							AWS kube-up: Build kubeconfig asap  
						
						 
						
						... 
						
						
						
						Once we've built the master, we can build kubeconfig.  By doing so, if
we time out waiting for the nodes, the system is still configured
correctly.
In particular, spot instances can be slow to launch.
Related to issue #21200  
						
						
					 
					
						2016-02-22 10:46:56 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Justin Santa Barbara 
							
						 
					 
					
						
						
							
						
						fb12c48cb7 
					 
					
						
						
							
							AWS kube-up: Allow spot instances  
						
						 
						
						... 
						
						
						
						I think we should probably leave this undocumented for now, until we
have a better way to launch multiple sets of nodes, but it's great for
cost savings while testing!
Fix  #21200  
						
						
					 
					
						2016-02-22 10:42:49 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								k8s-merge-robot 
							
						 
					 
					
						
						
							
						
						e629ee6bd3 
					 
					
						
						
							
							Merge pull request  #20704  from FujitsuEnablingSoftwareTechnologyGmbH/centos-support  
						
						 
						
						... 
						
						
						
						Auto commit by PR queue bot 
						
						
					 
					
						2016-02-22 02:35:22 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								k8s-merge-robot 
							
						 
					 
					
						
						
							
						
						85018f728e 
					 
					
						
						
							
							Merge pull request  #21258  from gmarek/heapster  
						
						 
						
						... 
						
						
						
						Auto commit by PR queue bot 
						
						
					 
					
						2016-02-22 01:24:58 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								k8s-merge-robot 
							
						 
					 
					
						
						
							
						
						3868bb433d 
					 
					
						
						
							
							Merge pull request  #21253  from gmarek/enable  
						
						 
						
						... 
						
						
						
						Auto commit by PR queue bot 
						
						
					 
					
						2016-02-22 01:24:57 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lukasz Zajaczkowski 
							
						 
					 
					
						
						
							
						
						82be3d08f3 
					 
					
						
						
							
							Add CentOS support  
						
						 
						
						
						
						
					 
					
						2016-02-22 07:41:35 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								k8s-merge-robot 
							
						 
					 
					
						
						
							
						
						facd8617ce 
					 
					
						
						
							
							Merge pull request  #21505  from bprashanth/flannel-etcd  
						
						 
						
						... 
						
						
						
						Auto commit by PR queue bot 
						
						
					 
					
						2016-02-21 18:09:12 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prashanth Balasubramanian 
							
						 
					 
					
						
						
							
						
						c97e8df65b 
					 
					
						
						
							
							Stricter checking of HAIRPIN_FLAG in salt.  
						
						 
						
						
						
						
					 
					
						2016-02-21 14:43:43 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								k8s-merge-robot 
							
						 
					 
					
						
						
							
						
						1ce188e557 
					 
					
						
						
							
							Merge pull request  #21430  from spxtr/e2e-internal  
						
						 
						
						... 
						
						
						
						Auto commit by PR queue bot 
						
						
					 
					
						2016-02-21 12:08:22 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								k8s-merge-robot 
							
						 
					 
					
						
						
							
						
						d6192dd152 
					 
					
						
						
							
							Merge pull request  #21342  from spxtr/remove-e2e-test  
						
						 
						
						... 
						
						
						
						Auto commit by PR queue bot 
						
						
					 
					
						2016-02-21 00:39:38 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prashanth Balasubramanian 
							
						 
					 
					
						
						
							
						
						2e8ff81de1 
					 
					
						
						
							
							Teach the kubelet about --hairpin-mode=promiscuous-bridge.  
						
						 
						
						
						
						
					 
					
						2016-02-20 22:40:54 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								k8s-merge-robot 
							
						 
					 
					
						
						
							
						
						0f1043d6df 
					 
					
						
						
							
							Merge pull request  #21299  from wojtek-t/always_event_etcd  
						
						 
						
						... 
						
						
						
						Auto commit by PR queue bot 
						
						
					 
					
						2016-02-20 21:03:27 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								k8s-merge-robot 
							
						 
					 
					
						
						
							
						
						65b5d0cbf4 
					 
					
						
						
							
							Merge pull request  #21269  from gmarek/metrics-grabber  
						
						 
						
						... 
						
						
						
						Auto commit by PR queue bot 
						
						
					 
					
						2016-02-20 16:37:16 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Justin Santa Barbara 
							
						 
					 
					
						
						
							
						
						dda792304d 
					 
					
						
						
							
							AWS Salt: Update to trusty, vivid, wily to Docker 1.9.1  
						
						 
						
						... 
						
						
						
						This updates all of our recognized Ubuntu images to use Docker 1.9.1 
						
						
					 
					
						2016-02-20 17:31:19 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								k8s-merge-robot 
							
						 
					 
					
						
						
							
						
						a12a2e984a 
					 
					
						
						
							
							Merge pull request  #21233  from justinsb/aws_wily  
						
						 
						
						... 
						
						
						
						Auto commit by PR queue bot 
						
						
					 
					
						2016-02-20 13:28:08 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								k8s-merge-robot 
							
						 
					 
					
						
						
							
						
						fe18055adc 
					 
					
						
						
							
							Merge pull request  #21165  from justinsb/aws_master_pd_in_fstab  
						
						 
						
						... 
						
						
						
						Auto commit by PR queue bot 
						
						
					 
					
						2016-02-20 00:29:46 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								k8s-merge-robot 
							
						 
					 
					
						
						
							
						
						6c5bf89ed3 
					 
					
						
						
							
							Merge pull request  #21160  from justinsb/aws_bigger_master  
						
						 
						
						... 
						
						
						
						Auto commit by PR queue bot 
						
						
					 
					
						2016-02-20 00:29:45 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Smith 
							
						 
					 
					
						
						
							
						
						a8b943dddd 
					 
					
						
						
							
							Revert "Put the container bridge in promiscuous mode."  
						
						 
						
						
						
						
					 
					
						2016-02-19 23:14:53 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prashanth B 
							
						 
					 
					
						
						
							
						
						b36e046fc8 
					 
					
						
						
							
							Merge pull request  #21326  from bprashanth/cbr0_promisc  
						
						 
						
						... 
						
						
						
						Put the container bridge in promiscuous mode. 
						
						
					 
					
						2016-02-19 17:52:34 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Joe Beda 
							
						 
					 
					
						
						
							
						
						11c7068b74 
					 
					
						
						
							
							Merge pull request  #21142  from justinsb/install_git_package  
						
						 
						
						... 
						
						
						
						Salt: Make sure git is installed, for gitRepo volumes 
						
						
					 
					
						2016-02-19 15:42:00 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prashanth Balasubramanian 
							
						 
					 
					
						
						
							
						
						a694a7ae4b 
					 
					
						
						
							
							Teach the kubelet about --hairpin-mode=promiscuous-bridge.  
						
						 
						
						
						
						
					 
					
						2016-02-19 14:59:16 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brendan Burns 
							
						 
					 
					
						
						
							
						
						8bda033ef1 
					 
					
						
						
							
							Merge pull request  #21444  from dchen1107/test1  
						
						 
						
						... 
						
						
						
						Log daemons' failure reasons to supervisord log files 
						
						
					 
					
						2016-02-19 13:08:19 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								k8s-merge-robot 
							
						 
					 
					
						
						
							
						
						9274783d62 
					 
					
						
						
							
							Merge pull request  #20965  from olivierlemasle/vagrant-bearertoken  
						
						 
						
						... 
						
						
						
						Auto commit by PR queue bot 
						
						
					 
					
						2016-02-19 12:08:08 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								k8s-merge-robot 
							
						 
					 
					
						
						
							
						
						ced1ddfcc7 
					 
					
						
						
							
							Merge pull request  #21428  from ArtfulCoder/fluentes  
						
						 
						
						... 
						
						
						
						Auto commit by PR queue bot 
						
						
					 
					
						2016-02-19 08:56:10 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								k8s-merge-robot 
							
						 
					 
					
						
						
							
						
						841d3f8311 
					 
					
						
						
							
							Merge pull request  #21357  from WeixuZhuang/fix  
						
						 
						
						... 
						
						
						
						Auto commit by PR queue bot 
						
						
					 
					
						2016-02-19 02:14:51 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phillip Wittrock 
							
						 
					 
					
						
						
							
						
						8151021369 
					 
					
						
						
							
							Merge pull request  #21508  from mml/slow-flake  
						
						 
						
						... 
						
						
						
						Also retain docker and kubelet logs. 
						
						
					 
					
						2016-02-18 18:53:20 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Zach Loafman 
							
						 
					 
					
						
						
							
						
						7f94e3ecdc 
					 
					
						
						
							
							Bump container-vm in 1.2 to container-v1-2-v20160218 (prerelease)  
						
						 
						
						
						
						
					 
					
						2016-02-18 15:00:50 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Zach Loafman 
							
						 
					 
					
						
						
							
						
						6fe3023a3d 
					 
					
						
						
							
							Revert "Upgrade gce cluster to docker 1.9.1"  
						
						 
						
						... 
						
						
						
						This reverts commit f07070d129 . 
						
						
					 
					
						2016-02-18 14:28:13 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prashanth Balasubramanian 
							
						 
					 
					
						
						
							
						
						1e3db8ef9e 
					 
					
						
						
							
							Don't impose a memory limit on flannel etcd.  
						
						 
						
						
						
						
					 
					
						2016-02-18 13:52:58 -08:00