Merge "Sync kolla patches"
authorZhijiang Hu <hu.zhijiang@zte.com.cn>
Fri, 26 Jan 2018 01:50:48 +0000 (01:50 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Fri, 26 Jan 2018 01:50:48 +0000 (01:50 +0000)
commitf4c8d7c8017e26f5dd000b0e576c5de24e31fa29
tree37d0b4c729dcc6c959a5e6fadad5a254e78e8439
parent23c8486309b679d1e5b2da18dcb32c8c6f179882
parent12cf0e6da155d2f3a7d229901af005a500c906c5
Merge "Sync kolla patches"