Merge "Based on Controller Actor calling CDS or APPC(Current Flow)"

author Steve Smokowski <ss835w@att.com>

Tue, 18 Feb 2020 17:14:40 +0000 (17:14 +0000)

committer Gerrit Code Review <gerrit@onap.org>

Tue, 18 Feb 2020 17:14:40 +0000 (17:14 +0000)
author Steve Smokowski <ss835w@att.com>
Tue, 18 Feb 2020 17:14:40 +0000 (17:14 +0000)
committer Gerrit Code Review <gerrit@onap.org>
Tue, 18 Feb 2020 17:14:40 +0000 (17:14 +0000)
diff --cc adapters/mso-catalog-db-adapter/src/test/java/org/onap/so/db/catalog/client/CatalogDbClientTest.java
Simple merge
diff --cc mso-catalog-db/src/main/java/org/onap/so/db/catalog/client/CatalogDbClient.java
Simple merge
author	Steve Smokowski <ss835w@att.com>
	Tue, 18 Feb 2020 17:14:40 +0000 (17:14 +0000)
committer	Gerrit Code Review <gerrit@onap.org>
	Tue, 18 Feb 2020 17:14:40 +0000 (17:14 +0000)
		1	2
adapters/mso-catalog-db-adapter/src/test/java/org/onap/so/db/catalog/client/CatalogDbClientTest.java	patch \|	diff1 \|	diff2 \|	blob \| history
mso-catalog-db/src/main/java/org/onap/so/db/catalog/client/CatalogDbClient.java	patch \|	diff1 \|	diff2 \|	blob \| history