Merge "Sync the kolla version with the upstream"
authorZhijiang Hu <hu.zhijiang@zte.com.cn>
Fri, 18 Aug 2017 10:41:00 +0000 (10:41 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Fri, 18 Aug 2017 10:41:00 +0000 (10:41 +0000)
commit47eb83e9e022219139f7514527f5cc5d1c11e653
tree0677af18f110d39aea034717a27d5da1804d9482
parentff4b08f10fec583f49aac62bcb8a3898926a05e7
parent9171fa46a8332f926f8e53413834c4a2ff2f3b00
Merge "Sync the kolla version with the upstream"