Merge "Solve ubuntu vi problem"
authoryunlong ying <ying.yunlong@zte.com.cn>
Thu, 2 Aug 2018 03:47:19 +0000 (03:47 +0000)
committerGerrit Code Review <gerrit@onap.org>
Thu, 2 Aug 2018 03:47:19 +0000 (03:47 +0000)

Trivial merge