Merge "[NFV] Reduce instance requirements"

author xiaodong shang <shang.xiaodong@zte.com.cn>

Fri, 2 Sep 2016 06:22:56 +0000 (06:22 +0000)

committer Gerrit Code Review <gerrit@172.30.200.206>

Fri, 2 Sep 2016 06:22:56 +0000 (06:22 +0000)
author xiaodong shang <shang.xiaodong@zte.com.cn>
Fri, 2 Sep 2016 06:22:56 +0000 (06:22 +0000)
committer Gerrit Code Review <gerrit@172.30.200.206>
Fri, 2 Sep 2016 06:22:56 +0000 (06:22 +0000)
diff --cc tosca2heat/heat-translator/translator/tests/data/hot_output/hot_nfv_sample.yaml
Simple merge
diff --cc tosca2heat/heat-translator/translator/tests/data/test_tosca_nfv_sample.yaml
Simple merge
author	xiaodong shang <shang.xiaodong@zte.com.cn>
	Fri, 2 Sep 2016 06:22:56 +0000 (06:22 +0000)
committer	Gerrit Code Review <gerrit@172.30.200.206>
	Fri, 2 Sep 2016 06:22:56 +0000 (06:22 +0000)
		1	2
tosca2heat/heat-translator/translator/tests/data/hot_output/hot_nfv_sample.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
tosca2heat/heat-translator/translator/tests/data/test_tosca_nfv_sample.yaml	patch \|	diff1 \|	diff2 \|	blob \| history