Merge remote-tracking branch 'origin/dublin' 27/86627/2
authorBenjamin, Max (mb388a) <mb388a@us.att.com>
Tue, 30 Apr 2019 14:07:45 +0000 (10:07 -0400)
committerSteve Smokowski <ss835w@att.com>
Fri, 3 May 2019 16:20:12 +0000 (16:20 +0000)
commita16bf8f9315060822c16ec92a0532b8375c1a399
treeccb13c95c1b6c63f0495566e8bd347ad7402a84b
parentd26574fe0e44f43bfbf507adbf91a28c1b53c63a
parent54b6e6ac185b55d89248cd3c55b1d7766ecaf294
Merge remote-tracking branch 'origin/dublin'

merged dublin into master branch

Change-Id: Ifb78d405611b65764fd4f01558b0e703551ed663
Issue-ID: SO-1830
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com>
adapters/mso-adapter-utils/src/main/java/org/onap/so/openstack/utils/MsoMulticloudUtils.java
adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/inventory/create/CreateInventoryTask.java
adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/inventory/create/CreateInventoryTaskTest.java
asdc-controller/src/main/java/org/onap/so/asdc/client/ASDCController.java
asdc-controller/src/main/java/org/onap/so/asdc/installer/heat/ToscaResourceInstaller.java