Merge "Update Logging"

author Rob Daugherty <rd472p@att.com>

Fri, 31 Aug 2018 18:14:48 +0000 (18:14 +0000)

committer Gerrit Code Review <gerrit@onap.org>

Fri, 31 Aug 2018 18:14:48 +0000 (18:14 +0000)
author Rob Daugherty <rd472p@att.com>
Fri, 31 Aug 2018 18:14:48 +0000 (18:14 +0000)
committer Gerrit Code Review <gerrit@onap.org>
Fri, 31 Aug 2018 18:14:48 +0000 (18:14 +0000)
diff --cc mso-catalog-db/src/main/java/org/onap/so/db/catalog/client/CatalogDbClient.java
Simple merge
diff --cc mso-catalog-db/src/test/java/org/onap/so/db/catalog/ControllerSelectionReferenceTest.java
Simple merge
author	Rob Daugherty <rd472p@att.com>
	Fri, 31 Aug 2018 18:14:48 +0000 (18:14 +0000)
committer	Gerrit Code Review <gerrit@onap.org>
	Fri, 31 Aug 2018 18:14:48 +0000 (18:14 +0000)
		1	2
mso-catalog-db/src/main/java/org/onap/so/db/catalog/client/CatalogDbClient.java	patch \|	diff1 \|	diff2 \|	blob \| history
mso-catalog-db/src/test/java/org/onap/so/db/catalog/ControllerSelectionReferenceTest.java	patch \|	diff1 \|	diff2 \|	blob \| history