| commit | 85ebf9ba07752ef2990d3480abe565445015422a | [log] [tgz] |
|---|---|---|
| author | Michael Crosby <crosbymichael@gmail.com> | Wed Jun 01 14:00:26 2016 -0700 |
| committer | Michael Crosby <crosbymichael@gmail.com> | Wed Jun 01 14:00:26 2016 -0700 |
| tree | edef9d54172c280715781e11cc682a684fed17fa | |
| parent | 9810988fb50e4a57162eef8f3004e00cae2814a5 [diff] | |
| parent | 4251e1e99e16ff7ff5557ee16e5bef26a14cd127 [diff] |
Merge pull request #23176 from mlaventure/increase-containerd-start-timeout Increase containerd start-timeout to 2 minutes