Merge "Match the config from ubuntu"
authorJiang, Yunhong <yunhong.jiang@intel.com>
Wed, 8 Mar 2017 23:37:03 +0000 (23:37 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Wed, 8 Mar 2017 23:37:03 +0000 (23:37 +0000)

Trivial merge