Shams Asari 73ca1601fb Merge remote-tracking branch 'open/master' into os-merge-68145e1 ...

# Conflicts:
#	node/src/integration-test/kotlin/net/corda/node/flows/FlowOverrideTests.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/DriverDSLImpl.kt
#	tools/explorer/src/main/kotlin/net/corda/explorer/ExplorerSimulation.kt

2018-11-28 17:10:09 +00:00

..

capsule

[CORDA-2249]: Specified unique applicationId in Capsule manifest. (#1585)

2018-11-22 13:53:29 +00:00

dist

really disable building installer dist on OS X (#1547)

2018-11-07 18:16:51 +00:00

lib

[ENT-2539] Implement support for holding node Legal Identity keys in Ultimaco HSM (#1571)

2018-11-22 13:40:50 +00:00

src

Merge remote-tracking branch 'open/master' into os-merge-68145e1

2018-11-28 17:10:09 +00:00

build.gradle

Hsm simulator: Clean up existing docker images before running.

2018-11-28 14:16:04 +00:00