Code Review
/
dmaap
/
dbcapi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix conflict in unit tests
[dmaap/dbcapi.git]
/
src
/
test
/
java
/
org
/
onap
/
dmaap
/
dbcapi
/
service
/
MR_ClusterServiceTest.java
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
(file)
--- 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();
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();
dls.addDcaeLocation( loc );
ApiError err = new ApiError();