Commit c8b10b12 authored by Riabokon Stanislav(EPAM)[GCP]'s avatar Riabokon Stanislav(EPAM)[GCP]
Browse files

Merge branch 'integration-master' of...

Merge branch 'integration-master' of https://git.epam.com/go3-nrg/platform/System/file into integration-master

# Conflicts:
#	provider/file-gcp-datastore/src/main/resources/application.properties
#	provider/file-gcp/src/main/resources/application.properties
parents 8a765f5d c911fd98
Pipeline #4344 failed with stage
in 1 minute and 50 seconds
......@@ -26,4 +26,4 @@ spring.cloud.gcp.datastore.namespace=odes-namespace
file.location.bucket-name= odes-os-file-temp
file.location.user-id= common-user
RECORDS_ROOT_URL=http://localhost:8082/api/storage/v2
RECORDS_ROOT_URL=${RECORDS_ROOT_URL}
......@@ -18,4 +18,4 @@
file.location.bucket-name= odes-os-file-temp
file.location.user-id= common-user
RECORDS_ROOT_URL=http://localhost:8082/api/storage/v2
RECORDS_ROOT_URL=${RECORDS_ROOT_URL}
Supports Markdown
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