tree c8767be36bb4d120c815d53b3cc7aeaf61a569fc
parent f0d9549f8f753a66d82e55d6413720c8aa417d3a
parent d3cb57f9be03817e6370014cf0e5dcd787623f31
author mcp-jenkins <mcp-jenkins@mirantis.com> 1553092640 +0000
committer Gerrit Code Review <mail@domain.com> 1553092640 +0000

Merge "Bump contanerd for k8s to 1.2.4"