From: Xuan Jia <jason.jiaxuan@gmail.com>
Date: Thu, 31 May 2018 01:15:02 +0000 (+0000)
Subject: Merge "enable kata 1.0 + containerd 1.1"
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=f83d24da3d410e1c2ce93ed79e390f1cac6c3067;p=container4nfv.git

Merge "enable kata 1.0 + containerd 1.1"
---

f83d24da3d410e1c2ce93ed79e390f1cac6c3067