Anthony Keenan 08f32a9329 Merge remote-tracking branch 'open/master' into anthony-os-merge-2018-10-24 ...

# Conflicts:
#	build.gradle
#	core/src/main/kotlin/net/corda/core/internal/JarSignatureCollector.kt
#	core/src/main/kotlin/net/corda/core/transactions/TransactionBuilder.kt
#	docs/source/cli-ux-guidelines.rst
#	docs/source/testnet-explorer-corda.rst
#	finance/src/integration-test/kotlin/net/corda/finance/flows/test/CashConfigDataFlowTest.kt
#	finance/src/main/kotlin/net/corda/finance/flows/CashConfigDataFlow.kt
#	node/src/integration-test/kotlin/net/corda/node/services/statemachine/FlowVersioningTest.kt
#	node/src/main/kotlin/net/corda/node/Corda.kt
#	node/src/main/kotlin/net/corda/node/internal/Node.kt
#	node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt
#	node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
#	node/src/test/kotlin/net/corda/node/internal/NodeTest.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/DriverDSLImpl.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/NodeBasedTest.kt
#	tools/explorer/src/main/kotlin/net/corda/explorer/ExplorerSimulation.kt

2018-10-25 11:30:52 +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

fixed order of repudiation and information disclos

2018-10-22 22:17:23 +02:00