Merge "Solve ubuntu vi problem"
authorFu Jinhua <fu.jinhua@zte.com.cn>
Thu, 2 Aug 2018 03:23:50 +0000 (03:23 +0000)
committerGerrit Code Review <gerrit@onap.org>
Thu, 2 Aug 2018 03:23:50 +0000 (03:23 +0000)

Trivial merge