Shams Asari 249d8d1ac7 Further merge fixes

2017-12-11 10:42:50 +00:00

..

integration-test/kotlin/net/corda/testing

Merge branch 'master' into shams-master-merge-081217

2017-12-11 10:23:16 +00:00

main/kotlin/net/corda/testing

Further merge fixes

2017-12-11 10:42:50 +00:00

test/java/net/corda

Configurable authorization/authentication data sources [CORDA-827] (#2145)

2017-12-11 08:39:09 +00:00