corda

mirror of https://github.com/corda/corda.git synced 2025-03-15 08:41:04 +00:00

History

szymonsztuka dc25fc28b7 Merge remote-tracking branch 'remotes/open/master' into corda/os-merge-20-09-2018

# Conflicts:
#	core-deterministic/build.gradle
#	core/src/test/kotlin/net/corda/core/utilities/KotlinUtilsTest.kt
#	node/src/integration-test/kotlin/net/corda/node/BootTests.kt
#	node/src/integration-test/kotlin/net/corda/node/flows/AsymmetricCorDappsTests.kt
#	node/src/integration-test/kotlin/net/corda/node/modes/draining/P2PFlowsDrainingModeTest.kt
#	node/src/main/kotlin/net/corda/node/internal/CordaRPCOpsImpl.kt
#	node/src/main/kotlin/net/corda/node/serialization/kryo/Kryo.kt
#	node/src/main/kotlin/net/corda/node/serialization/kryo/KryoSerializationScheme.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/InternalTestUtils.kt

2018-09-20 16:39:34 +01:00

blobinspector

CORDA-1391: Separate out Checkpoint serialization (#3922 )

2018-09-19 14:23:29 +01:00

bootstrapper

CORDA-1959 - Enforce backwards compatibility of new CLI's (#3939 )

2018-09-14 14:37:52 +01:00

cliutils

[CORDA-1996]: Apply error code to exceptions that do not propagate to NodeStartup. (#3964 )

2018-09-19 14:24:21 +02:00

dbmigration

CORDA-1964: Fix publication of tools:dbmigration project.