ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-02-21 01:42:24 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix merge

Browse Source
This commit is contained in:
Tudor Malene 2018-05-14 15:23:27 +01:00 committed by tudor.malene@gmail.com
parent 9b42dd3a87
commit 95054f71d5
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
node/src/main/kotlin/net/corda/node/services/config/ConfigUtilities.kt
View File

@ -52,7 +52,7 @@ object ConfigHelper {
val systemOverrides = systemProperties().cordaEntriesOnly() val systemOverrides = systemProperties().cordaEntriesOnly()
val environmentOverrides = systemEnvironment().cordaEntriesOnly() val environmentOverrides = systemEnvironment().cordaEntriesOnly()
val finalConfig = configOf( val finalConfig = configOverrides
// Add substitution values here // Add substitution values here
.withFallback(configOf("custom.nodeOrganizationName" to parseToDbSchemaFriendlyName(baseDirectory.fileName.toString()))) //for database integration tests .withFallback(configOf("custom.nodeOrganizationName" to parseToDbSchemaFriendlyName(baseDirectory.fileName.toString()))) //for database integration tests
.withFallback(systemOverrides) //for database integration tests .withFallback(systemOverrides) //for database integration tests