From: Zhijiang Hu <hu.zhijiang@zte.com.cn>
Date: Thu, 16 Mar 2017 07:59:02 +0000 (+0000)
Subject: Merge "unify the definition of NETWORK and NETWORK_CONF"
X-Git-Tag: 1.0.0~17
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=baf9d4792e97dbb01b2e76299189a2997fb1eb3e;p=daisy.git

Merge "unify the definition of NETWORK and NETWORK_CONF"
---

baf9d4792e97dbb01b2e76299189a2997fb1eb3e