Merge "no need to separate dpdk from network.yaml.j2"
authorAlex Yang <yangyang1@zte.com.cn>
Thu, 18 Jan 2018 03:18:41 +0000 (03:18 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Thu, 18 Jan 2018 03:18:41 +0000 (03:18 +0000)
1  2 
ci/deploy/deploy.sh

Simple merge