going the long way to merge 91/33691/1
authordglFromAtt <dgl@research.att.com>
Wed, 28 Feb 2018 19:24:03 +0000 (14:24 -0500)
committerdglFromAtt <dgl@research.att.com>
Wed, 28 Feb 2018 19:25:53 +0000 (14:25 -0500)
commit41317d52ae9991ff49ca21c72aceb6037dffc9ad
tree7cacd8835d4621d623427dd40fb3d786982cf58a
parent503da874ce876dbe463bcc1a03f63ea0f48fe650
going the long way to merge

Change-Id: I99cacbe27cc232e9ebd6ff68c90d439d4b2a785a
Signed-off-by: dglFromAtt <dgl@research.att.com>
Issue-ID: DMAAP-316
Signed-off-by: dglFromAtt <dgl@research.att.com>
etc/dmaapbc.properties
src/main/java/org/onap/dmaap/dbcapi/service/DR_NodeService.java
src/main/java/org/onap/dmaap/dbcapi/service/DcaeLocationService.java
src/main/java/org/onap/dmaap/dbcapi/service/FeedService.java
src/test/java/org/onap/dmaap/dbcapi/resource/DR_NodeResourceTest.java [new file with mode: 0644]
src/test/java/org/onap/dmaap/dbcapi/testframework/DmaapObjectFactory.java