Merge "Fix test failing"
authorYujun Zhang <zhang.yujunz@zte.com.cn>
Sat, 26 Nov 2016 10:02:06 +0000 (10:02 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Sat, 26 Nov 2016 10:02:06 +0000 (10:02 +0000)

Trivial merge