Michael Crosby 
							
						 
					 
					
						
						
							
						
						87d15a5ffc 
					 
					
						
						
							
							Set OnClose shim function  
						
						... 
						
						
						
						When restoring a task make sure that dead shims are handled.
Fixes  #2078 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com > 
						
						
					 
					
						2018-02-06 10:45:50 -05:00 
						 
				 
			
				
					
						
							
							
								Michael Crosby 
							
						 
					 
					
						
						
							
						
						9745a4d448 
					 
					
						
						
							
							Update ttrpc to d4528379866b0ce7e9d71f3eb96f0582fc  
						
						... 
						
						
						
						Contains the OnClose method for the client
Signed-off-by: Michael Crosby <crosbymichael@gmail.com > 
						
						
					 
					
						2018-02-06 10:27:36 -05:00 
						 
				 
			
				
					
						
							
							
								Stephen Day 
							
						 
					 
					
						
						
							
						
						aa49e704e2 
					 
					
						
						
							
							Merge pull request  #2095  from dmcgowan/fix-whiteout-parent-directories  
						
						... 
						
						
						
						archive: fixes missing whiteout parent directories 
						
						
					 
					
						2018-02-05 11:26:17 -08:00 
						 
				 
			
				
					
						
							
							
								Michael Crosby 
							
						 
					 
					
						
						
							
						
						1a4f609526 
					 
					
						
						
							
							Merge pull request  #2098  from dankohn/master  
						
						... 
						
						
						
						Change name of LICENSE 
						
						
					 
					
						2018-02-05 10:08:13 -05:00 
						 
				 
			
				
					
						
							
							
								Dan Kohn 
							
						 
					 
					
						
						
							
						
						48d27e4e74 
					 
					
						
						
							
							Change name of LICENSE  
						
						... 
						
						
						
						This will allow GitHub's License API to properly classify containerd as Apache
https://developer.github.com/v3/licenses/ 
Signed-off-by: Dan Kohn <dan@dankohn.com > 
						
						
					 
					
						2018-02-05 09:46:28 -05:00 
						 
				 
			
				
					
						
							
							
								Michael Crosby 
							
						 
					 
					
						
						
							
						
						ae3c72c853 
					 
					
						
						
							
							Merge pull request  #2099  from tkporter/master  
						
						... 
						
						
						
						Add time type conversions for 32bit Unix platforms 
						
						
					 
					
						2018-02-05 09:19:58 -05:00 
						 
				 
			
				
					
						
							
							
								Michael Crosby 
							
						 
					 
					
						
						
							
						
						78bd07afef 
					 
					
						
						
							
							Merge pull request  #1746  from AkihiroSuda/split-differ-interface  
						
						... 
						
						
						
						diff: resplit Applier from Differ 
						
						
					 
					
						2018-02-05 09:18:56 -05:00 
						 
				 
			
				
					
						
							
							
								Michael Crosby 
							
						 
					 
					
						
						
							
						
						13733b6a65 
					 
					
						
						
							
							Merge pull request  #2100  from kunalkushwaha/testsuite-typo-fix  
						
						... 
						
						
						
						Testcase name corrected 
						
						
					 
					
						2018-02-05 09:11:41 -05:00 
						 
				 
			
				
					
						
							
							
								Michael Crosby 
							
						 
					 
					
						
						
							
						
						549ec7b9dd 
					 
					
						
						
							
							Merge pull request  #2091  from crosbymichael/shim-size  
						
						... 
						
						
						
						Shim optimizations for size and cpu 
						
						
					 
					
						2018-02-05 09:10:56 -05:00 
						 
				 
			
				
					
						
							
							
								Kunal Kushwaha 
							
						 
					 
					
						
						
							
						
						1d6047aa71 
					 
					
						
						
							
							Testcase name corrected  
						
						... 
						
						
						
						checkUploadStatus actaully verifys contents on Updating already written buffers,
hence should be called as checkUpdateStatus
Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp > 
						
						
					 
					
						2018-02-05 11:12:12 +09:00 
						 
				 
			
				
					
						
							
							
								Trevor Porter 
							
						 
					 
					
						
						
							
						
						d994d08664 
					 
					
						
						
							
							Add time type conversion for 32bit Unix platforms  
						
						... 
						
						
						
						Ensures the time.Unix function is given int64 arguments
Signed-off-by: Trevor Porter <trkporter@ucdavis.edu > 
						
						
					 
					
						2018-02-03 22:36:36 +00:00 
						 
				 
			
				
					
						
							
							
								Derek McGowan 
							
						 
					 
					
						
						
							
						
						d778dd15d8 
					 
					
						
						
							
							Fixes missing whiteout parent directories  
						
						... 
						
						
						
						Ensures include parents is called for whiteouts
Signed-off-by: Derek McGowan <derek@mcgstyle.net > 
						
						
					 
					
						2018-02-02 17:02:14 -08:00 
						 
				 
			
				
					
						
							
							
								Stephen Day 
							
						 
					 
					
						
						
							
						
						83cf371556 
					 
					
						
						
							
							Merge pull request  #2090  from AkihiroSuda/remove-wtf  
						
						... 
						
						
						
						vendor: update BurntSushi/toml for MIT license 
						
						
					 
					
						2018-02-02 16:45:41 -08:00 
						 
				 
			
				
					
						
							
							
								Michael Crosby 
							
						 
					 
					
						
						
							
						
						254807da5b 
					 
					
						
						
							
							Merge pull request  #2092  from dnephin/fix-vendor-validation  
						
						... 
						
						
						
						Fix vendor validation 
						
						
					 
					
						2018-02-02 16:51:12 -05:00 
						 
				 
			
				
					
						
							
							
								Daniel Nephin 
							
						 
					 
					
						
						
							
						
						2125d8efc3 
					 
					
						
						
							
							Fix vendor validation  
						
						... 
						
						
						
						vendor/ must be removed first, otherwise files added to vendor/ that aren't added to
vendor.conf will not cause the validation to fail.
Signed-off-by: Daniel Nephin <dnephin@gmail.com > 
						
						
					 
					
						2018-02-02 10:54:21 -08:00 
						 
				 
			
				
					
						
							
							
								Michael Crosby 
							
						 
					 
					
						
						
							
						
						8ee29a17e6 
					 
					
						
						
							
							Bump gc threshold to 40%  
						
						... 
						
						
						
						Doing tests, this is a better balance for the threshold in reguards to
memory and cpu usage.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com > 
						
						
					 
					
						2018-02-02 11:00:34 -05:00 
						 
				 
			
				
					
						
							
							
								Akihiro Suda 
							
						 
					 
					
						
						
							
						
						36a2deb029 
					 
					
						
						
							
							vendor: update BurntSushi/toml for MIT license  
						
						... 
						
						
						
						Follow-up to #2088 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp > 
						
						
					 
					
						2018-02-02 15:51:57 +09:00 
						 
				 
			
				
					
						
							
							
								Derek McGowan 
							
						 
					 
					
						
						
							
						
						44f6bc40d4 
					 
					
						
						
							
							Merge pull request  #2088  from stevvooe/update-toml  
						
						... 
						
						
						
						vendor: update BurntSushi/toml for MIT license 
						
						
					 
					
						2018-02-01 15:19:49 -08:00 
						 
				 
			
				
					
						
							
							
								Stephen J Day 
							
						 
					 
					
						
						
							
						
						85678e1885 
					 
					
						
						
							
							vendor: update BurntSushi/toml for MIT license  
						
						... 
						
						
						
						Signed-off-by: Stephen J Day <stephen.day@docker.com > 
						
						
					 
					
						2018-02-01 14:58:31 -08:00 
						 
				 
			
				
					
						
							
							
								Michael Crosby 
							
						 
					 
					
						
						
							
						
						db78450e8b 
					 
					
						
						
							
							Remove grpclogger from log package  
						
						... 
						
						
						
						Signed-off-by: Michael Crosby <crosbymichael@gmail.com > 
						
						
					 
					
						2018-02-01 17:20:49 -05:00 
						 
				 
			
				
					
						
							
							
								Michael Crosby 
							
						 
					 
					
						
						
							
						
						ea00fc793b 
					 
					
						
						
							
							Remove protobuf for mount in shim  
						
						... 
						
						
						
						Signed-off-by: Michael Crosby <crosbymichael@gmail.com > 
						
						
					 
					
						2018-02-01 17:18:40 -05:00 
						 
				 
			
				
					
						
							
							
								Derek McGowan 
							
						 
					 
					
						
						
							
						
						ba61af665d 
					 
					
						
						
							
							Merge pull request  #2086  from crosbymichael/bump-cgroups  
						
						... 
						
						
						
						Bump cgroups to c0710c92e8b3a44681d1321dcfd1360fc5 
						
						
					 
					
						2018-02-01 10:33:22 -08:00 
						 
				 
			
				
					
						
							
							
								Michael Crosby 
							
						 
					 
					
						
						
							
						
						5915c9ab5e 
					 
					
						
						
							
							Bump cgroups to c0710c92e8b3a44681d1321dcfd1360fc5  
						
						... 
						
						
						
						This fixes performance issues with walking `/dev` to get device paths.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com > 
						
						
					 
					
						2018-02-01 11:43:42 -05:00 
						 
				 
			
				
					
						
							
							
								Michael Crosby 
							
						 
					 
					
						
						
							
						
						7e1d8aafee 
					 
					
						
						
							
							Merge pull request  #1957  from tophj-ibm/check-for-mounts-tests  
						
						... 
						
						
						
						running tests in a container 
						
						
					 
					
						2018-02-01 11:39:58 -05:00 
						 
				 
			
				
					
						
							
							
								Phil Estes 
							
						 
					 
					
						
						
							
						
						34e24997b2 
					 
					
						
						
							
							Merge pull request  #2081  from crosbymichael/debug  
						
						... 
						
						
						
						Allow tcp debug address 
						
						
					 
					
						2018-02-01 08:15:09 +00:00 
						 
				 
			
				
					
						
							
							
								Phil Estes 
							
						 
					 
					
						
						
							
						
						ec14a97f6f 
					 
					
						
						
							
							Merge pull request  #2080  from crosbymichael/metrics  
						
						... 
						
						
						
						Update prometheus client and go-metrics 
						
						
					 
					
						2018-02-01 08:07:50 +00:00 
						 
				 
			
				
					
						
							
							
								Phil Estes 
							
						 
					 
					
						
						
							
						
						6570c97942 
					 
					
						
						
							
							Merge pull request  #2084  from Random-Liu/simplify-mount-lookup  
						
						... 
						
						
						
						Simplify mount.Lookup. 
						
						
					 
					
						2018-02-01 08:04:22 +00:00 
						 
				 
			
				
					
						
							
							
								Derek McGowan 
							
						 
					 
					
						
						
							
						
						1f5587247b 
					 
					
						
						
							
							Merge pull request  #2082  from hinshun/refactor-client-push  
						
						... 
						
						
						
						Refactor client push into helper function 
						
						
					 
					
						2018-01-31 22:12:15 -08:00 
						 
				 
			
				
					
						
							
							
								Lantao Liu 
							
						 
					 
					
						
						
							
						
						d0779a6145 
					 
					
						
						
							
							Simplify mount.Lookup.  
						
						... 
						
						
						
						Signed-off-by: Lantao Liu <lantaol@google.com > 
						
						
					 
					
						2018-02-01 03:25:05 +00:00 
						 
				 
			
				
					
						
							
							
								Edgar Lee 
							
						 
					 
					
						
						
							
						
						e53cdc9a49 
					 
					
						
						
							
							Refactor client push into helper function  
						
						... 
						
						
						
						Signed-off-by: Edgar Lee <edgar.lee@docker.com > 
						
						
					 
					
						2018-01-31 17:13:54 -08:00 
						 
				 
			
				
					
						
							
							
								Michael Crosby 
							
						 
					 
					
						
						
							
						
						55aa0b415b 
					 
					
						
						
							
							Don't enable debug endpoints in default config  
						
						... 
						
						
						
						Signed-off-by: Michael Crosby <crosbymichael@gmail.com > 
						
						
					 
					
						2018-01-31 11:08:51 -05:00 
						 
				 
			
				
					
						
							
							
								Michael Crosby 
							
						 
					 
					
						
						
							
						
						98b53e0dd3 
					 
					
						
						
							
							Allow tcp debug address  
						
						... 
						
						
						
						This uses a simple `IsAbs` check to see if we are using an on disk path
for a unix socket vs an address since we do not prefix addresses with
`unix://` or `tcp://`.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com > 
						
						
					 
					
						2018-01-31 10:19:33 -05:00 
						 
				 
			
				
					
						
							
							
								Michael Crosby 
							
						 
					 
					
						
						
							
						
						7615153271 
					 
					
						
						
							
							Update prometheus client and go-metrics  
						
						... 
						
						
						
						Signed-off-by: Michael Crosby <crosbymichael@gmail.com > 
						
						
					 
					
						2018-01-31 10:12:41 -05:00 
						 
				 
			
				
					
						
							
							
								Christopher Jones 
							
						 
					 
					
						
						
							
						
						f65cdc18a7 
					 
					
						
						
							
							Use protobuf and runc setup scripts in .travis.yml  
						
						... 
						
						
						
						Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com > 
						
						
					 
					
						2018-01-30 14:44:38 -05:00 
						 
				 
			
				
					
						
							
							
								Christopher Jones 
							
						 
					 
					
						
						
							
						
						a8c5ff57e5 
					 
					
						
						
							
							Cleanup loop devices after test failure  
						
						... 
						
						
						
						Cleans up loop devices if part of the test or mount process fails.
Also increases btrfs default file size to 650MB to accommodate
minimum btrfs size on ppc64le and s390x
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com > 
						
						
					 
					
						2018-01-30 14:44:36 -05:00 
						 
				 
			
				
					
						
							
							
								Christopher Jones 
							
						 
					 
					
						
						
							
						
						051ac5dd63 
					 
					
						
						
							
							running tests in a container  
						
						... 
						
						
						
						This provides a dockerfile for building a container to run the containerd tests
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com > 
						
						
					 
					
						2018-01-30 14:44:30 -05:00 
						 
				 
			
				
					
						
							
							
								Kenfe-Mickaël Laventure 
							
						 
					 
					
						
						
							
						
						eed3b1c804 
					 
					
						
						
							
							Merge pull request  #2076  from stevvooe/content-testsuite-unique-seed  
						
						... 
						
						
						
						content/testsuite: ensure unique content per test 
						
						
					 
					
						2018-01-29 17:16:41 -08:00 
						 
				 
			
				
					
						
							
							
								Stephen J Day 
							
						 
					 
					
						
						
							
						
						3295bca5bf 
					 
					
						
						
							
							content/testsuite: pass context to hold lease  
						
						... 
						
						
						
						Signed-off-by: Stephen J Day <stephen.day@docker.com > 
						
						
					 
					
						2018-01-29 16:29:51 -08:00 
						 
				 
			
				
					
						
							
							
								Stephen J Day 
							
						 
					 
					
						
						
							
						
						c517a005b5 
					 
					
						
						
							
							content/testsuite: ensure unique content per test  
						
						... 
						
						
						
						Signed-off-by: Stephen J Day <stephen.day@docker.com > 
						
						
					 
					
						2018-01-29 15:29:38 -08:00 
						 
				 
			
				
					
						
							
							
								Michael Crosby 
							
						 
					 
					
						
						
							
						
						5f89502a24 
					 
					
						
						
							
							Merge pull request  #1790  from jessvalarezo/ctr-c-create  
						
						... 
						
						
						
						ctr: add container create cmd and config flag 
						
						
					 
					
						2018-01-29 17:19:14 -05:00 
						 
				 
			
				
					
						
							
							
								Phil Estes 
							
						 
					 
					
						
						
							
						
						0c07626faf 
					 
					
						
						
							
							Merge pull request  #2073  from crosbymichael/revert-json  
						
						... 
						
						
						
						revert json iter changes 
						
						
					 
					
						2018-01-29 16:30:30 -05:00 
						 
				 
			
				
					
						
							
							
								Michael Crosby 
							
						 
					 
					
						
						
							
						
						2f06259a84 
					 
					
						
						
							
							Revert "Add github.com/json-iterator/go to vendor"  
						
						... 
						
						
						
						This reverts commit 43a9473a53crosbymichael@gmail.com > 
						
						
					 
					
						2018-01-29 15:47:58 -05:00 
						 
				 
			
				
					
						
							
							
								Michael Crosby 
							
						 
					 
					
						
						
							
						
						d179c61231 
					 
					
						
						
							
							Revert "Use jsoniteer for faster json encoding/decoding"  
						
						... 
						
						
						
						This reverts commit 4233b87b89crosbymichael@gmail.com > 
						
						
					 
					
						2018-01-29 15:47:48 -05:00 
						 
				 
			
				
					
						
							
							
								Phil Estes 
							
						 
					 
					
						
						
							
						
						c6a7d10568 
					 
					
						
						
							
							Merge pull request  #2065  from dmcgowan/content-discard-over-truncate  
						
						... 
						
						
						
						content: update copy to discard instead of truncate 
						
						
					 
					
						2018-01-29 11:20:17 -05:00 
						 
				 
			
				
					
						
							
							
								Derek McGowan 
							
						 
					 
					
						
						
							
						
						b763777288 
					 
					
						
						
							
							diff: rename differ to comparer  
						
						... 
						
						
						
						Remove combined interface and split implementations.
Signed-off-by: Derek McGowan <derek@mcgstyle.net > 
						
						
					 
					
						2018-01-26 16:32:09 -08:00 
						 
				 
			
				
					
						
							
							
								Phil Estes 
							
						 
					 
					
						
						
							
						
						ec15fe95aa 
					 
					
						
						
							
							Merge pull request  #2068  from crosbymichael/json  
						
						... 
						
						
						
						Use jsoniter for faster json encoding/decoding 
						
						
					 
					
						2018-01-26 17:47:48 -05:00 
						 
				 
			
				
					
						
							
							
								Michael Crosby 
							
						 
					 
					
						
						
							
						
						c024da2dec 
					 
					
						
						
							
							Fix vendor exclude  
						
						... 
						
						
						
						Signed-off-by: Michael Crosby <crosbymichael@gmail.com > 
						
						
					 
					
						2018-01-26 16:58:05 -05:00 
						 
				 
			
				
					
						
							
							
								Michael Crosby 
							
						 
					 
					
						
						
							
						
						4233b87b89 
					 
					
						
						
							
							Use jsoniteer for faster json encoding/decoding  
						
						... 
						
						
						
						Signed-off-by: Michael Crosby <crosbymichael@gmail.com > 
						
						
					 
					
						2018-01-26 16:32:55 -05:00 
						 
				 
			
				
					
						
							
							
								Michael Crosby 
							
						 
					 
					
						
						
							
						
						43a9473a53 
					 
					
						
						
							
							Add github.com/json-iterator/go to vendor  
						
						... 
						
						
						
						Signed-off-by: Michael Crosby <crosbymichael@gmail.com > 
						
						
					 
					
						2018-01-26 16:32:55 -05:00 
						 
				 
			
				
					
						
							
							
								Stephen Day 
							
						 
					 
					
						
						
							
						
						c71595f6e2 
					 
					
						
						
							
							Merge pull request  #2067  from crosbymichael/all-caps  
						
						... 
						
						
						
						Add WithAllCapabilities as SpecOpt 
						
						
					 
					
						2018-01-26 13:21:33 -08:00