diff options
| author |   Sébastien Determe <sebastien.determe@intl.att.com> | 2019-04-26 11:18:20 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-04-26 11:18:20 +0000 |
| commit | d4976b71508b2a3670167b7f0f412d3bfdd6ce54 (patch) | |
| tree | 79ed5e3c737b73ace0ca5736780a9edd86a151c1 /src/main/resources | |
| parent | 373b07b5c7f7e74cffb3a7250a691cb649856b94 (diff) | |
| parent | 09db2381ed40693ae06009e9430ede3fe17fbc40 (diff) | |
Merge "Clamp uses new Loop implementation by default"
Diffstat (limited to 'src/main/resources')
| -rw-r--r-- | src/main/resources/application-noaaf.properties | 2 | ||||
| -rw-r--r-- | src/main/resources/application.properties | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/main/resources/application-noaaf.properties b/src/main/resources/application-noaaf.properties index 736d1fa1f..6124f10d8 100644 --- a/src/main/resources/application-noaaf.properties +++ b/src/main/resources/application-noaaf.properties @@ -55,7 +55,7 @@ server.port=8080 server.servlet.context-path=/ #Modified engine-rest applicationpath -spring.profiles.active=clamp-default,clamp-default-user,clamp-sdc-controller +spring.profiles.active=clamp-default,clamp-default-user,clamp-sdc-controller-new spring.http.converters.preferred-json-mapper=gson #The max number of active threads in this pool diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index cf85f8869..123443175 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -5,6 +5,8 @@ # Copyright (C) 2017-2019 AT&T Intellectual Property. All rights # reserved. # ================================================================================ +# Modifications copyright (c) 2019 Nokia +# ================================================================================\ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -72,7 +74,7 @@ server.http-to-https-redirection.port=8080 server.servlet.context-path=/ #Modified engine-rest applicationpath -spring.profiles.active=clamp-default,clamp-aaf-authentication,clamp-sdc-controller +spring.profiles.active=clamp-default,clamp-aaf-authentication,clamp-sdc-controller-new spring.http.converters.preferred-json-mapper=gson #The max number of active threads in this pool |