Merge "Fix the assert comparison error in test_get_conf.py"
authorZhijiang Hu <hu.zhijiang@zte.com.cn>
Fri, 4 Aug 2017 08:54:08 +0000 (08:54 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Fri, 4 Aug 2017 08:54:08 +0000 (08:54 +0000)

Trivial merge