From: Benjamin, Max (mb388a) <mb388a@us.att.com>
Date: Tue, 30 Apr 2019 14:07:45 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/dublin'
X-Git-Tag: 1.5.2~371^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F27%2F86627%2F2;p=so.git

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>
---

a16bf8f9315060822c16ec92a0532b8375c1a399
diff --cc adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/inventory/create/CreateInventoryTaskTest.java
index 03622db655,c358d3f34c..8513f30d4b
--- a/adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/inventory/create/CreateInventoryTaskTest.java
+++ b/adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/inventory/create/CreateInventoryTaskTest.java
@@@ -10,6 -10,10 +10,10 @@@ import org.mockito.InjectMocks
  import org.mockito.Mock;
  import org.mockito.Mockito;
  import org.mockito.MockitoAnnotations;
 -import org.onap.so.adapters.audit.AAIObjectAudit;
 -import org.onap.so.adapters.audit.AAIObjectAuditList;
+ import org.onap.so.client.graphinventory.GraphInventoryCommonObjectMapperProvider;
++import org.onap.so.objects.audit.AAIObjectAudit;
++import org.onap.so.objects.audit.AAIObjectAuditList;
+ import com.fasterxml.jackson.core.JsonProcessingException;
  
  public class CreateInventoryTaskTest {