Merge "bugfix hardcoded network configuration"

author Zhijiang Hu <hu.zhijiang@zte.com.cn>

Thu, 23 Mar 2017 02:04:10 +0000 (02:04 +0000)

committer Gerrit Code Review <gerrit@opnfv.org>

Thu, 23 Mar 2017 02:04:10 +0000 (02:04 +0000)
author Zhijiang Hu <hu.zhijiang@zte.com.cn>
Thu, 23 Mar 2017 02:04:10 +0000 (02:04 +0000)
committer Gerrit Code Review <gerrit@opnfv.org>
Thu, 23 Mar 2017 02:04:10 +0000 (02:04 +0000)
diff --cc ci/deploy/deploy.sh
Simple merge
diff --cc deploy/post/execute.py
Simple merge
author	Zhijiang Hu <hu.zhijiang@zte.com.cn>
	Thu, 23 Mar 2017 02:04:10 +0000 (02:04 +0000)
committer	Gerrit Code Review <gerrit@opnfv.org>
	Thu, 23 Mar 2017 02:04:10 +0000 (02:04 +0000)
		1	2
ci/deploy/deploy.sh	patch \|	diff1 \|	diff2 \|	blob \| history
deploy/post/execute.py	patch \|	diff1 \|	diff2 \|	blob \| history