tree ba17b2290d15d59b43b1b1568683ece25d4e21ca
parent 6c6b08eb87cc24a776df0b9d6a765fe5c38d120d
parent d9d682ee9272055f81864c8dfe939df9d4658c16
author mcp-jenkins <mcp-jenkins@mirantis.com> 1544709067 +0000
committer Gerrit Code Review <mail@domain.com> 1544709067 +0000

Merge "Add containerd support for Calico upgrade"