Merge "Rework Cli."
authorzhihui wu <wu.zhihui1@zte.com.cn>
Mon, 9 Jan 2017 02:22:21 +0000 (02:22 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Mon, 9 Jan 2017 02:22:21 +0000 (02:22 +0000)

Trivial merge