Merge "enable kata 1.0 + containerd 1.1"
authorXuan Jia <jason.jiaxuan@gmail.com>
Thu, 31 May 2018 01:15:02 +0000 (01:15 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Thu, 31 May 2018 01:15:02 +0000 (01:15 +0000)

Trivial merge