Lucas Käldström
							
						 
					 | 
					
						
						
							
						
						f18d40c28e
					 | 
					
						
						
							
							Update docker-multinode, use restart=on-failure and bump to 1.2.0-alpha.7
						
						
						
						
						
						
					 | 
					
						2016-02-02 15:34:38 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Lucas Käldström
							
						 
					 | 
					
						
						
							
						
						75e8c3f180
					 | 
					
						
						
							
							Update docker and docker-multinode docs on master to require 1.2.x and use the hyperkube-arch image
						
						
						
						
						
						
					 | 
					
						2016-01-29 23:01:49 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								k8s-merge-robot
							
						 
					 | 
					
						
						
							
						
						d246ed00fa
					 | 
					
						
						
							
							Merge pull request #18894 from luxas/update_master_multi
						
						
						
						
						
						
						
						Auto commit by PR queue bot 
						
						
					 | 
					
						2016-01-11 20:38:41 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Lucas Käldström
							
						 
					 | 
					
						
						
							
						
						7d497441b3
					 | 
					
						
						
							
							Update docker-multinode instructions and version. Also run kube-proxy in a pod in the docker-multnode manifest
						
						
						
						
						
						
					 | 
					
						2016-01-11 16:45:56 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chao Xu
							
						 
					 | 
					
						
						
							
						
						2b2f285777
					 | 
					
						
						
							
							run hack/update-generated-docs.sh
						
						
						
						
						
						
					 | 
					
						2015-12-21 10:41:30 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tim Hockin
							
						 
					 | 
					
						
						
							
						
						8ba250e149
					 | 
					
						
						
							
							Bump flannel to 0.5.5 in instructions
						
						
						
						
						
						
					 | 
					
						2015-12-07 14:20:30 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tim Hockin
							
						 
					 | 
					
						
						
							
						
						dab591b629
					 | 
					
						
						
							
							Run update-gendocs
						
						
						
						
						
						
					 | 
					
						2015-11-13 13:57:57 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tim Hockin
							
						 
					 | 
					
						
						
							
						
						faa5c5885a
					 | 
					
						
						
							
							Update docs for running under docker
						
						
						
						
						
						
						
						Make them a bit more version safe. 
						
						
					 | 
					
						2015-11-09 22:08:06 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								He Simei
							
						 
					 | 
					
						
						
							
						
						7c9903bd02
					 | 
					
						
						
							
							mount /var/lib/docker rw
						
						
						
						
						
						
					 | 
					
						2015-10-17 09:53:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								He Simei
							
						 
					 | 
					
						
						
							
						
						9c3600d5d3
					 | 
					
						
						
							
							enhance upstart param for containerized kubelet
						
						
						
						
						
						
					 | 
					
						2015-10-17 09:52:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Filip Grzadkowski
							
						 
					 | 
					
						
						
							
						
						595381d48c
					 | 
					
						
						
							
							Upgrade flannel to 0.5.3
						
						
						
						
						
						
					 | 
					
						2015-09-24 15:57:27 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Brendan Burns
							
						 
					 | 
					
						
						
							
						
						868aca04a0
					 | 
					
						
						
							
							Merge pull request #12687 from eparis/verfiy-dash
						
						
						
						
						
						
						
						Update flag-dash whitelist 
						
						
					 | 
					
						2015-08-14 10:12:54 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Walter
							
						 
					 | 
					
						
						
							
						
						792fc2269b
					 | 
					
						
						
							
							change underscores to dashes to match the command line argument
						
						
						
						
						
						
					 | 
					
						2015-08-06 22:13:44 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								He Simei
							
						 
					 | 
					
						
						
							
						
						52ea1108eb
					 | 
					
						
						
							
							fix upstart param for containerized kebelet
						
						
						
						
						
						
					 | 
					
						2015-08-02 10:30:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Robinson
							
						 
					 | 
					
						
						
							
						
						acd1bed70e
					 | 
					
						
						
							
							Fix capitalization of Kubernetes in the documentation.
						
						
						
						
						
						
					 | 
					
						2015-07-20 14:39:36 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Robinson
							
						 
					 | 
					
						
						
							
						
						68d6e3a8ae
					 | 
					
						
						
							
							Replace `` with  when emphasizing something inline in docs/
						
						
						
						
						
						
					 | 
					
						2015-07-19 09:05:17 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Robinson
							
						 
					 | 
					
						
						
							
						
						261e347e60
					 | 
					
						
						
							
							Improve markdown highlighting in docker multinode getting started guides.
						
						
						
						
						
						
					 | 
					
						2015-07-19 03:56:22 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tim Hockin
							
						 
					 | 
					
						
						
							
						
						33f1862830
					 | 
					
						
						
							
							Run gendocs
						
						
						
						
						
						
					 | 
					
						2015-07-17 15:35:43 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Smith
							
						 
					 | 
					
						
						
							
						
						f7873d2a1f
					 | 
					
						
						
							
							apply changes
						
						
						
						
						
						
					 | 
					
						2015-07-17 11:04:46 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tim Hockin
							
						 
					 | 
					
						
						
							
						
						542e13d2d3
					 | 
					
						
						
							
							Better scary message
						
						
						
						
						
						
					 | 
					
						2015-07-17 09:28:49 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tim Hockin
							
						 
					 | 
					
						
						
							
						
						39b86908a1
					 | 
					
						
						
							
							Run gendocs
						
						
						
						
						
						
					 | 
					
						2015-07-14 17:28:47 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tim Hockin
							
						 
					 | 
					
						
						
							
						
						79f9cd7c83
					 | 
					
						
						
							
							Run gendocs
						
						
						
						
						
						
					 | 
					
						2015-07-14 15:28:59 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Brendan Burns
							
						 
					 | 
					
						
						
							
						
						ab4448a0d6
					 | 
					
						
						
							
							Update multi-node docker instructions:
						
						
						
						
						
						
						
						* Update etcd and add a warning about Docker 1.7.0
   * Update kubernetes to 0.21.2, Flannel to 0.5.0
   * Remove --sync-nodes which is removed. 
						
						
					 | 
					
						2015-07-13 21:28:07 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Smith
							
						 
					 | 
					
						
						
							
						
						821e08fded
					 | 
					
						
						
							
							Apply mungedocs changes
						
						
						
						
						
						
					 | 
					
						2015-07-13 17:48:40 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Eric Tune
							
						 
					 | 
					
						
						
							
						
						f353592cde
					 | 
					
						
						
							
							Remove colon from end of doc heading.
						
						
						
						
						
						
					 | 
					
						2015-07-13 12:07:26 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tim Hockin
							
						 
					 | 
					
						
						
							
						
						fffc64e733
					 | 
					
						
						
							
							Run gendocs and munges
						
						
						
						
						
						
					 | 
					
						2015-07-13 11:27:48 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wizard
							
						 
					 | 
					
						
						
							
						
						4e92f409a0
					 | 
					
						
						
							
							update docker k8s approach
						
						
						
						
						
						
					 | 
					
						2015-06-16 09:44:21 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ed Costello
							
						 
					 | 
					
						
						
							
						
						05714d416b
					 | 
					
						
						
							
							Copy edits for spelling errors and typos
						
						
						
						
						
						
						
						Signed-off-by: Ed Costello <epc@epcostello.com> 
						
						
					 | 
					
						2015-06-12 18:47:28 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Brendan Burns
							
						 
					 | 
					
						
						
							
						
						4b904c34a8
					 | 
					
						
						
							
							Update Docker instructions.
						
						
						
						
						
						
					 | 
					
						2015-06-10 21:40:06 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Kris Rousey
							
						 
					 | 
					
						
						
							
						
						6e83eb2636
					 | 
					
						
						
							
							Updating docs/ to v1
						
						
						
						
						
						
					 | 
					
						2015-06-05 14:09:49 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Brendan Burns
							
						 
					 | 
					
						
						
							
						
						f51f8b3a86
					 | 
					
						
						
							
							More fixes for release 0.17.0
						
						
						
						
						
						
					 | 
					
						2015-05-18 20:47:03 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeff Lowdermilk
							
						 
					 | 
					
						
						
							
						
						553f9f822b
					 | 
					
						
						
							
							Add ga-beacon analytics to gendocs scripts
						
						
						
						
						
						
						
						hack/run-gendocs.sh puts ga-beacon analytics link into all md files,
hack/verify-gendocs.sh verifies presence of link. 
						
						
					 | 
					
						2015-05-15 18:56:38 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Brendan Burns
							
						 
					 | 
					
						
						
							
						
						49977e6a47
					 | 
					
						
						
							
							Revert "Update docker examples to 0.15.0"
						
						
						
						
						
						
					 | 
					
						2015-04-24 10:05:27 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Brendan Burns
							
						 
					 | 
					
						
						
							
						
						8c947de4e2
					 | 
					
						
						
							
							Update docker examples to 0.15.0
						
						
						
						
						
						
					 | 
					
						2015-04-20 15:40:08 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Brendan Burns
							
						 
					 | 
					
						
						
							
						
						6217ae0242
					 | 
					
						
						
							
							Update to 0.14.2 in the docker k8s instructions.
						
						
						
						
						
						
					 | 
					
						2015-04-10 22:02:55 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Brendan Burns
							
						 
					 | 
					
						
						
							
						
						b3c46b5c66
					 | 
					
						
						
							
							Add a Docker multi-node setup.
						
						
						
						
						
						
					 | 
					
						2015-04-07 21:22:33 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |