tree ab4a23da0cb4a8fa72aa125db2dda26b5173e9d4
parent 09fa77d79ad7a1294817636d0b40dd315c345ff0
parent 7b995bdc3728bf90d609adf22b845f7e4f6b651d
author mcp-jenkins <mcp-jenkins@mirantis.com> 1554825225 +0000
committer Gerrit Code Review <mail@domain.com> 1554825225 +0000

Merge "Bump containerd to 1.2.5"