Merge "bugfix: solve upgrade setuptools failed problem"
authorYujun Zhang <zhang.yujunz@zte.com.cn>
Wed, 14 Dec 2016 04:10:32 +0000 (04:10 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Wed, 14 Dec 2016 04:10:32 +0000 (04:10 +0000)

Trivial merge