Merge "unify the definition of NETWORK and NETWORK_CONF"
authorZhijiang Hu <hu.zhijiang@zte.com.cn>
Thu, 16 Mar 2017 07:59:02 +0000 (07:59 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Thu, 16 Mar 2017 07:59:02 +0000 (07:59 +0000)

Trivial merge