Merge "NSB Topology fix for Prox 4 port test case" into stable/fraser

author Emma Foley <emma.l.foley@intel.com>

Fri, 29 Jun 2018 10:06:13 +0000 (10:06 +0000)

committer Gerrit Code Review <gerrit@opnfv.org>

Fri, 29 Jun 2018 10:06:13 +0000 (10:06 +0000)
author Emma Foley <emma.l.foley@intel.com>
Fri, 29 Jun 2018 10:06:13 +0000 (10:06 +0000)
committer Gerrit Code Review <gerrit@opnfv.org>
Fri, 29 Jun 2018 10:06:13 +0000 (10:06 +0000)
diff --cc samples/vnf_samples/nsut/prox/tc_prox_heat_context_bng-4.yaml
Simple merge
diff --cc samples/vnf_samples/nsut/prox/tc_prox_heat_context_bng_qos-4.yaml
Simple merge
diff --cc samples/vnf_samples/nsut/prox/tc_prox_heat_context_vpe-4.yaml
Simple merge
author	Emma Foley <emma.l.foley@intel.com>
	Fri, 29 Jun 2018 10:06:13 +0000 (10:06 +0000)
committer	Gerrit Code Review <gerrit@opnfv.org>
	Fri, 29 Jun 2018 10:06:13 +0000 (10:06 +0000)
		1	2
samples/vnf_samples/nsut/prox/tc_prox_heat_context_bng-4.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
samples/vnf_samples/nsut/prox/tc_prox_heat_context_bng_qos-4.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
samples/vnf_samples/nsut/prox/tc_prox_heat_context_vpe-4.yaml	patch \|	diff1 \|	diff2 \|	blob \| history