ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-30 17:57:02 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
022daf2190
corda/testing
History
Shams Asari 52173219c3 Merge remote-tracking branch 'open/master' into shams-os-merge-020118 
# Conflicts:
#	client/rpc/src/integration-test/java/net/corda/client/rpc/CordaRPCJavaClientTest.java
#	node/src/integration-test/kotlin/net/corda/node/NodeKeystoreCheckTest.kt
#	node/src/integration-test/kotlin/net/corda/node/services/network/NetworkMapTest.kt
#	node/src/integration-test/kotlin/net/corda/node/utilities/registration/NodeRegistrationTest.kt
#	node/src/integration-test/kotlin/net/corda/services/messaging/MQSecurityTest.kt
#	node/src/main/kotlin/net/corda/node/services/config/ConfigUtilities.kt
#	node/src/test/kotlin/net/corda/node/services/events/NodeSchedulerServiceTest.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/DriverDSLImpl.kt
2018-01-02 15:32:32 +00:00
..
node-driver Merge remote-tracking branch 'open/master' into shams-os-merge-020118 2018-01-02 15:32:32 +00:00
smoke-test-utils CORDA-830 Introducing the network bootstrapper 2017-12-17 23:49:57 +00:00
test-common CORDA-830 Introducing the network bootstrapper 2017-12-17 23:49:57 +00:00
test-utils Merge remote-tracking branch 'open/master' into shams-os-merge-020118 2018-01-02 15:32:32 +00:00