Merge "add the scenarios option"
authorZhijiang Hu <hu.zhijiang@zte.com.cn>
Fri, 23 Jun 2017 07:30:38 +0000 (07:30 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Fri, 23 Jun 2017 07:30:38 +0000 (07:30 +0000)

Trivial merge