From: Zhijiang Hu <hu.zhijiang@zte.com.cn>
Date: Fri, 18 Aug 2017 10:41:00 +0000 (+0000)
Subject: Merge "Sync the kolla version with the upstream"
X-Git-Tag: opnfv-5.0.RC1~32
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=47eb83e9e022219139f7514527f5cc5d1c11e653;p=daisy.git

Merge "Sync the kolla version with the upstream"
---

47eb83e9e022219139f7514527f5cc5d1c11e653