resolve issues due to conflict 13/37813/1
authorDeterme, Sebastien (sd378r) <sd378r@intl.att.com>
Thu, 22 Mar 2018 15:45:27 +0000 (16:45 +0100)
committerDeterme, Sebastien (sd378r) <sd378r@intl.att.com>
Thu, 22 Mar 2018 15:45:27 +0000 (16:45 +0100)
commit36647a6e6dedf4d4fb82da40ab8bc99cd137ad1d
treeabce3877de334d6b1a7a82d23b7aa5000c05670f
parentdb8e8d530dd37d395ac060f0900330ed67b068d8
resolve issues due to conflict

Resolve the issues due to the conflicts and rework the Sdc startup

Issue-ID: CLAMP-81
Change-Id: I3f6fa5268140e902b445c316bc40f326256d17c0
Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>
src/main/java/org/onap/clamp/clds/config/spring/CldsSdcControllerConfiguration.java
src/main/java/org/onap/clamp/clds/sdc/controller/SdcSingleController.java
src/main/java/org/onap/clamp/clds/service/CldsService.java
src/test/resources/application.properties