Sebastiaan van Stijn 3c63c67eb1 Merge pull request #23434 from thaJeztah/cherry-pick-increase-containerd-start-timeout ...

(cherry-pick) Increase containerd start-timeout to 2 minutes on master
Upstream-commit: a1f60b9db3edc06f66d8977ebcf66f8ae606baec
Component: engine

2016-06-10 23:21:52 +02:00

components/engine

Merge pull request #23434 from thaJeztah/cherry-pick-increase-containerd-start-timeout

2016-06-10 23:21:52 +02:00

Description

No description provided

310 MiB

Languages

Go 92%

Shell 5.5%

Dockerfile 1.1%

Go-Checksums 0.9%

Makefile 0.3%

Other 0.2%