David Michael 081582f146 Merge pull request #2416 from dm0-/containerd-opts
app-emulation/containerd: use the upstream default timeout
2017-03-14 17:10:11 -07:00
..