Merge "Use PDF(POD descriptor file) and correct the mapping of nodes and roles"

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

Wed, 9 Aug 2017 02:17:19 +0000 (02:17 +0000)

committer Gerrit Code Review <gerrit@opnfv.org>

Wed, 9 Aug 2017 02:17:19 +0000 (02:17 +0000)
author Zhijiang Hu <hu.zhijiang@zte.com.cn>
Wed, 9 Aug 2017 02:17:19 +0000 (02:17 +0000)
committer Gerrit Code Review <gerrit@opnfv.org>
Wed, 9 Aug 2017 02:17:19 +0000 (02:17 +0000)
diff --cc ci/deploy/deploy.sh
Simple merge
diff --cc requirements.txt
Simple merge
diff --cc test-requirements.txt
Simple merge
author	Zhijiang Hu <hu.zhijiang@zte.com.cn>
	Wed, 9 Aug 2017 02:17:19 +0000 (02:17 +0000)
committer	Gerrit Code Review <gerrit@opnfv.org>
	Wed, 9 Aug 2017 02:17:19 +0000 (02:17 +0000)
		1	2
ci/deploy/deploy.sh	patch \|	diff1 \|	diff2 \|	blob \| history
requirements.txt	patch \|	diff1 \|	diff2 \|	blob \| history
test-requirements.txt	patch \|	diff1 \|	diff2 \|	blob \| history