tudor.malene@gmail.com 3233d1d91f Merge branch 'master_partial' into tudor_os_merge_23_10 ...

# Conflicts:
#	core/src/main/kotlin/net/corda/core/internal/JarSignatureCollector.kt
#	core/src/main/kotlin/net/corda/core/transactions/LedgerTransaction.kt
#	core/src/main/kotlin/net/corda/core/transactions/TransactionBuilder.kt
#	core/src/test/kotlin/net/corda/core/contracts/PackageOwnershipVerificationTests.kt
#	core/src/test/kotlin/net/corda/core/internal/JarSignatureCollectorTest.kt
#	node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
#	node/src/test/kotlin/net/corda/node/services/persistence/NodeAttachmentServiceTest.kt
#	testing/test-utils/src/main/kotlin/net/corda/testing/dsl/TestDSL.kt
#	testing/test-utils/src/main/kotlin/net/corda/testing/dsl/TransactionDSLInterpreter.kt

2018-10-23 10:36:06 +01:00

..

data-model-upgrades

Attempt to improve the explanation at the start.

2018-10-15 11:41:19 +01:00

maximus

Early Discussion Of 'Maximus' Scope and Provisional High Level Design (#4055)

2018-10-22 17:17:41 +01:00

reference-states

Make the reference states design doc render better and more consistently with the other design docs.

2018-10-04 18:33:32 +02:00

targetversion

CorDapp minimum and target version design doc. (#3798)

2018-09-05 11:12:35 +01:00

threat-model

CORDA-1787 Bring threat model into the docsite (#3817)

2018-09-21 18:48:47 +01:00