From: Zhijiang Hu <hu.zhijiang@zte.com.cn>
Date: Fri, 26 Jan 2018 01:50:48 +0000 (+0000)
Subject: Merge "Sync kolla patches"
X-Git-Tag: opnfv-6.0.0~10
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=f4c8d7c8017e26f5dd000b0e576c5de24e31fa29;p=daisy.git

Merge "Sync kolla patches"
---

f4c8d7c8017e26f5dd000b0e576c5de24e31fa29