ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-29 09:18:58 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
0f4bb8a87c
corda/testing
History
Shams Asari 5f781193b6 Merge remote-tracking branch 'open/master' into os-merge-d3446e2 
# Conflicts:
#	node/src/integration-test/kotlin/net/corda/node/BootTests.kt
#	node/src/integration-test/kotlin/net/corda/node/services/AttachmentLoadingTests.kt
#	node/src/main/kotlin/net/corda/node/services/statemachine/FlowStateMachineImpl.kt
#	testing/smoke-test-utils/src/main/kotlin/net/corda/smoketesting/NodeProcess.kt
#	tools/demobench/src/main/kotlin/net/corda/demobench/model/NodeController.kt
2018-04-23 15:50:24 +01:00
..
node-driver Merge remote-tracking branch 'open/master' into os-merge-d3446e2 2018-04-23 15:50:24 +01:00
smoke-test-utils Merge remote-tracking branch 'open/master' into os-merge-d3446e2 2018-04-23 15:50:24 +01:00
test-common Merge remote-tracking branch 'open/master' into os-merge-d3446e2 2018-04-23 15:50:24 +01:00
test-utils Merge remote-tracking branch 'open/master' into os-merge-1288f63 2018-04-16 17:35:43 +01:00