LankyDan c06830d851 Merge branch 'release/os/4.4' into dan/os-4.4-to-4.5-merge-2020-07-01 ... # Conflicts: # core/src/main/kotlin/net/corda/core/node/ServiceHub.kt # node/src/integration-test-slow/kotlin/net/corda/node/services/statemachine/StatemachineGeneralErrorHandlingTest.kt # node/src/integration-test-slow/kotlin/net/corda/node/services/statemachine/StatemachineKillFlowErrorHandlingTest.kt # node/src/integration-test/kotlin/net/corda/node/flows/FlowEntityManagerTest.kt # node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt # node/src/main/kotlin/net/corda/node/services/statemachine/TransitionExecutorImpl.kt # node/src/main/kotlin/net/corda/node/services/statemachine/interceptors/HospitalisingInterceptor.kt		2020-07-01 17:32:36 +01:00
..
Jenkinsfile	Merge branch 'release/os/4.4' into dan/os-4.4-to-4.5-merge-2020-07-01	2020-07-01 17:32:36 +01:00