From 95054f71d5b10b1d4befd1bc96dccd315d0bb6a0 Mon Sep 17 00:00:00 2001 From: Tudor Malene Date: Mon, 14 May 2018 15:23:27 +0100 Subject: [PATCH 1/2] Fix merge --- .../kotlin/net/corda/node/services/config/ConfigUtilities.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/node/src/main/kotlin/net/corda/node/services/config/ConfigUtilities.kt b/node/src/main/kotlin/net/corda/node/services/config/ConfigUtilities.kt index 4eb8cfc72e..3c47746835 100644 --- a/node/src/main/kotlin/net/corda/node/services/config/ConfigUtilities.kt +++ b/node/src/main/kotlin/net/corda/node/services/config/ConfigUtilities.kt @@ -52,7 +52,7 @@ object ConfigHelper { val systemOverrides = systemProperties().cordaEntriesOnly() val environmentOverrides = systemEnvironment().cordaEntriesOnly() - val finalConfig = configOf( + val finalConfig = configOverrides // Add substitution values here .withFallback(configOf("custom.nodeOrganizationName" to parseToDbSchemaFriendlyName(baseDirectory.fileName.toString()))) //for database integration tests .withFallback(systemOverrides) //for database integration tests From ec2035951822db7044ef5557f9ae16b4809e001a Mon Sep 17 00:00:00 2001 From: Tudor Malene Date: Mon, 14 May 2018 16:05:30 +0100 Subject: [PATCH 2/2] Fix merge --- .../src/main/kotlin/net/corda/testing/driver/Driver.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/testing/node-driver/src/main/kotlin/net/corda/testing/driver/Driver.kt b/testing/node-driver/src/main/kotlin/net/corda/testing/driver/Driver.kt index eb2901655e..1af3231dbd 100644 --- a/testing/node-driver/src/main/kotlin/net/corda/testing/driver/Driver.kt +++ b/testing/node-driver/src/main/kotlin/net/corda/testing/driver/Driver.kt @@ -283,6 +283,7 @@ data class DriverParameters( debugPortAllocation, systemProperties, useTestClock, + true, startNodesInProcess, waitForAllNodesToFinish, notarySpecs, @@ -326,6 +327,7 @@ data class DriverParameters( debugPortAllocation, systemProperties, useTestClock, + true, startNodesInProcess, waitForAllNodesToFinish, notarySpecs,