Christian Sailer 7765de0bf9 Merge branch 'master' of https://github.com/corda/corda into christians_os_merge_20171106

2017-11-06 17:27:13 +00:00

..

integration-test/kotlin/net/corda/client/jfx

Removed the ability to manually start notary nodes from the driver and MockNetwork. Instead by default a single notary is automatically started. This can be customised at creation time of the driver and MockNetwork. This more accurately models the concept of network parameters in a CZ.

2017-11-05 22:55:33 +00:00

main/kotlin/net/corda/client/jfx

Merge branch 'master' of https://github.com/corda/corda into christians_os_merge_20171106

2017-11-06 17:27:13 +00:00

test/kotlin/net/corda/client/jfx

Perform sensible currency conversion (#1941)

2017-10-25 19:25:19 +01:00