Merge "Fix error in py35"
authorYujun Zhang <zhang.yujunz@zte.com.cn>
Mon, 17 Apr 2017 02:38:57 +0000 (02:38 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Mon, 17 Apr 2017 02:38:57 +0000 (02:38 +0000)

Trivial merge