Skip to content
Snippets Groups Projects
Commit 0afe6d13 authored by Smitha Manjunath's avatar Smitha Manjunath
Browse files

cherry-pick commits and resolved conflicts

parent e818d255
No related branches found
No related tags found
2 merge requests!211Updated topics.json - Replace common with osdu as common data partition is not a concept in OSDU.,!165reverse merge M8 master to master
Hide whitespace changes
Inline Side-by-side
provider/register-azure/src/main/resources/application.properties
+ 1
− 1
View file @ 0afe6d13
......@@ -70,7 +70,7 @@ INTEGRATION_TEST_AUDIENCES=
CRON_JOB_EXPECTED_IP=0:0:0:0:0:0:0:1
SUBSCRIBER_PRIVATE_KEY_ID=
ENVIRONMENT=LOCAL
SUBSCRIBER_SECRET=395f1b05e95171d7c0dde0b19fd6cf
management.server.port=8081
management.endpoints.web.exposure.include=health,info,prometheus
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment