Merge "us mso workaround to skip shared vip ports"

author Seshu Kumar M <seshu.kumar.m@huawei.com>

Sat, 7 Nov 2020 07:08:03 +0000 (07:08 +0000)

committer Gerrit Code Review <gerrit@onap.org>

Sat, 7 Nov 2020 07:08:03 +0000 (07:08 +0000)
author Seshu Kumar M <seshu.kumar.m@huawei.com>
Sat, 7 Nov 2020 07:08:03 +0000 (07:08 +0000)
committer Gerrit Code Review <gerrit@onap.org>
Sat, 7 Nov 2020 07:08:03 +0000 (07:08 +0000)
diff --cc adapters/mso-openstack-adapters/src/main/java/org/onap/so/heatbridge/HeatBridgeImpl.java
Simple merge
diff --cc adapters/mso-openstack-adapters/src/test/java/org/onap/so/heatbridge/HeatBridgeImplTest.java
Simple merge
author	Seshu Kumar M <seshu.kumar.m@huawei.com>
	Sat, 7 Nov 2020 07:08:03 +0000 (07:08 +0000)
committer	Gerrit Code Review <gerrit@onap.org>
	Sat, 7 Nov 2020 07:08:03 +0000 (07:08 +0000)
		1	2
adapters/mso-openstack-adapters/src/main/java/org/onap/so/heatbridge/HeatBridgeImpl.java	patch \|	diff1 \|	diff2 \|	blob \| history
adapters/mso-openstack-adapters/src/test/java/org/onap/so/heatbridge/HeatBridgeImplTest.java	patch \|	diff1 \|	diff2 \|	blob \| history