Shams Asari 5cf7ecd9ed Merge branch 'master' into feature-network-parameters ...

# Conflicts:
#	testing/node-driver/src/main/kotlin/net/corda/testing/driver/Driver.kt

2017-11-21 15:01:52 +00:00

..

integration-test/kotlin/net/corda/verifier

Merge branch 'master' into feature-network-parameters

2017-11-21 15:01:52 +00:00

main

Introduce contextLogger (#2085)

2017-11-20 11:31:08 +00:00