From: dglFromAtt <dgl@research.att.com>
Date: Mon, 20 May 2019 18:29:02 +0000 (-0400)
Subject: Fix conflict in unit tests
X-Git-Tag: 2.0.1~24
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=dmaap%2Fdbcapi.git;a=commitdiff_plain;h=a26907336f4f04d754689b7750d0cd592f7057bb

Fix conflict in unit tests

Change-Id: I433213a61a9da64278e1ecaa25f067a36e99ce61
Signed-off-by: dglFromAtt <dgl@research.att.com>
Issue-ID: DMAAP-1205
---

diff --git a/src/test/java/org/onap/dmaap/dbcapi/service/MR_ClusterServiceTest.java b/src/test/java/org/onap/dmaap/dbcapi/service/MR_ClusterServiceTest.java
index 6552037..228078c 100644
--- a/src/test/java/org/onap/dmaap/dbcapi/service/MR_ClusterServiceTest.java
+++ b/src/test/java/org/onap/dmaap/dbcapi/service/MR_ClusterServiceTest.java
@@ -69,7 +69,7 @@ public class MR_ClusterServiceTest {
 		String locname = "central-demo";
 
 		DcaeLocationService dls = new DcaeLocationService();
-		DcaeLocation loc = new DcaeLocation( "CLLI1234", "central-onap", locname, "aZone", "10.10.10.0/24" );
+		DcaeLocation loc = new DcaeLocation( "CLLI1234", "some-onap", locname, "aZone", "10.10.10.0/24" );
 		dls.addDcaeLocation( loc );
 
 		ApiError err = new ApiError();