Commit Graph

11956 Commits

Author SHA1 Message Date
Lantao Liu
5e7347db53
Merge pull request #603 from Random-Liu/support-shared-pid
Support shared pid
2018-02-07 22:12:27 -08:00
Lantao Liu
532a895d7d Update critest.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-08 03:10:57 +00:00
Lantao Liu
46fc92f65f Use new namespace mode and support shared pid namespace.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-08 03:10:57 +00:00
Lantao Liu
605b4a7b6a Update imports
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-08 02:45:44 +00:00
Lantao Liu
ae85d0ee81 Update kubernetes to 0caa20c65f147e15f5545862510eb7e81c42b0a3.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-08 02:45:44 +00:00
Lantao Liu
047df7aca6
Merge pull request #602 from mikebrow/critools-install-minor-update
update critools
2018-02-07 18:44:37 -08:00
Akihiro Suda
80e6bbfc5d
Merge pull request #2113 from cpuguy83/use_continuity_copy
Use continuity fs package
2018-02-08 08:49:34 +09:00
Mike Brown
edb2b2379d change crictl sandboxes to pods; other references to sandboxes
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2018-02-07 17:23:59 -06:00
Lantao Liu
2acd6c1a5c
Merge pull request #599 from Random-Liu/update-ocicni
Update ocicni to main stream.
2018-02-07 13:47:12 -08:00
Lantao Liu
f36a8bf2ba
Merge pull request #598 from Random-Liu/use-containerd-log-trace
Use containerd log trace
2018-02-07 13:47:01 -08:00
Michael Crosby
e68bdbe9d9 Capture more error locations during stress tests
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-02-07 15:50:29 -05:00
Mike Brown
f19cd8ad67 update critools
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2018-02-07 13:47:23 -06:00
Lantao Liu
caf2bdb04a Update ocicni to main stream.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-07 19:39:06 +00:00
Lantao Liu
8925ef90be Use trace support in containerd.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-07 19:17:26 +00:00
Lantao Liu
b776e696bd Update containerd
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-07 19:17:26 +00:00
Brian Goff
c776b6d8d9 Use continuity fs package
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2018-02-07 12:40:52 -05:00
Michael Crosby
f12ba2407e
Merge pull request #2111 from Random-Liu/fix-trace-level
Fix trace level support.
2018-02-07 10:38:32 -05:00
Phil Estes
85a66da055
Merge pull request #2105 from Random-Liu/support-disable-plugins
Support disable plugins.
2018-02-07 06:34:47 +00:00
Lantao Liu
f2c585a59a Fix trace level support.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-07 01:14:05 +00:00
Lantao Liu
eee592c3ac Support disable plugins.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-06 23:39:44 +00:00
Lantao Liu
2fa185c09f
Merge pull request #596 from Random-Liu/remove-wrong-comment
Remove wrong comment. CRI is actually a grpc plugin of containerd now.
2018-02-06 13:32:43 -08:00
Derek McGowan
424c0fb59d
Merge pull request #2075 from hinshun/converter-mediatypes
Allow specifying media type for a converted schema1 manifest for compatibility with distribution
2018-02-06 10:58:16 -08:00
Stephen Day
0d9995e6e2
Merge pull request #2109 from crosbymichael/onclose
Use ttrpc OnClose to fix restored dead shims
2018-02-06 10:57:29 -08:00
Michael Crosby
95d4f53fbe Delete task on dead shim
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-02-06 12:46:06 -05:00
Michael Crosby
e92c913ea5
Merge pull request #2106 from Random-Liu/add-trace-level-support
Support trace level.
2018-02-06 11:03:52 -05:00
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
Lantao Liu
050ff32dea Support trace level.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-06 02:30:05 +00:00
Lantao Liu
447c2284cf Remove wrong comment. CRI is actually a grpc plugin of containerd now.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-06 00:45:32 +00:00
Lantao Liu
78f3df285f
Merge pull request #595 from Random-Liu/no-critest-in-release
Remove critest from release tarball.
2018-02-05 15:39:12 -08:00
Lantao Liu
5740e94338 Remove critest from release tarball.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-05 22:21:10 +00: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
Lantao Liu
f4625ef76c
Merge pull request #593 from Random-Liu/fix-ocicni-commit
I rebased my ocicni fork, and ruin the previous commit...
2018-02-04 12:14:26 -08: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
Lantao Liu
9f49134cc0 I rebased my fork, and ruin the previous commit...
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-03 00:58:54 +00: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
Lantao Liu
2b8800df2b
Merge pull request #592 from Random-Liu/fix-registry-mirror
Fix registry mirror.
2018-02-02 15:37:29 -08:00
Lantao Liu
92995e29e5 Fix registry mirror.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-02 22:52:36 +00:00
Michael Crosby
254807da5b
Merge pull request #2092 from dnephin/fix-vendor-validation
Fix vendor validation
2018-02-02 16:51:12 -05:00
Lantao Liu
b7c17ae06a
Merge pull request #585 from stevvooe/update-toml
vendor: update BurntSushi/toml for MIT license
2018-02-02 13:18:51 -08:00
Mike Brown
bec05e31df
Merge pull request #591 from Random-Liu/update-ocicni
Update ocicni to my fork.
2018-02-02 14:30:17 -06:00
Stephen J Day
680bafea76
vendor: update BurntSushi/toml for MIT license
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2018-02-02 11:53:48 -08:00