summaryrefslogtreecommitdiffstats
path: root/so-monitoring
diff options
context:
space:
mode:
authorSteve Smokowski <ss835w@att.com>2019-07-29 12:39:09 +0000
committerGerrit Code Review <gerrit@onap.org>2019-07-29 12:39:09 +0000
commit128fcc30cf60e9ddb3bc3df3c5486602f535f208 (patch)
tree2cabbd27482317becea63041756aed92413ed4a8 /so-monitoring
parentf4a767654c5af34b85c08faecd716a02544fcd5f (diff)
parent5ed9813a96c39439d85ad40992cd2f65bb6a170b (diff)
Merge "Upgrade springboot.version from 2.0.5 to 2.1.5."
Diffstat (limited to 'so-monitoring')
-rw-r--r--so-monitoring/so-monitoring-service/src/main/resources/application.yaml2
1 files changed, 2 insertions, 0 deletions
diff --git a/so-monitoring/so-monitoring-service/src/main/resources/application.yaml b/so-monitoring/so-monitoring-service/src/main/resources/application.yaml
index 347845e422..417febebf6 100644
--- a/so-monitoring/so-monitoring-service/src/main/resources/application.yaml
+++ b/so-monitoring/so-monitoring-service/src/main/resources/application.yaml
@@ -17,6 +17,8 @@ mso:
auth: Basic YnBlbDpwYXNzd29yZDEk
spring:
+ main:
+ allow-bean-definition-overriding: true
security:
usercredentials:
-