aboutsummaryrefslogtreecommitdiffstats
path: root/src/test
diff options
context:
space:
mode:
authorDeterme, Sebastien (sd378r) <sd378r@intl.att.com>2018-03-22 16:45:27 +0100
committerDeterme, Sebastien (sd378r) <sd378r@intl.att.com>2018-03-22 16:45:27 +0100
commit36647a6e6dedf4d4fb82da40ab8bc99cd137ad1d (patch)
treeabce3877de334d6b1a7a82d23b7aa5000c05670f /src/test
parentdb8e8d530dd37d395ac060f0900330ed67b068d8 (diff)
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>
Diffstat (limited to 'src/test')
-rw-r--r--src/test/resources/application.properties2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/resources/application.properties b/src/test/resources/application.properties
index ad035529..55666e5c 100644
--- a/src/test/resources/application.properties
+++ b/src/test/resources/application.properties
@@ -62,7 +62,7 @@ server.port=8080
server.contextPath=/
#Modified engine-rest applicationpath
-spring.profiles.active=clamp-default,clamp-spring-authentication
+spring.profiles.active=clamp-default,clamp-spring-authentication,clamp-sdc-controller
#The max number of active threads in this pool
server.tomcat.max-threads=200