Michele Sollecito
|
501929e91c
|
Merge remote-tracking branch 'remotes/open/master' into merges/27_11_2018_16_42
# Conflicts:
# node/src/integration-test/kotlin/net/corda/node/AddressBindingFailureTests.kt
# node/src/integration-test/kotlin/net/corda/node/amqp/AMQPBridgeTest.kt
# node/src/integration-test/kotlin/net/corda/node/amqp/ProtonWrapperTests.kt
# node/src/integration-test/kotlin/net/corda/node/modes/draining/FlowsDrainingModeContentionTest.kt
# node/src/integration-test/kotlin/net/corda/node/modes/draining/P2PFlowsDrainingModeTest.kt
# node/src/integration-test/kotlin/net/corda/node/modes/draining/RpcFlowsDrainingModeTest.kt
# node/src/integration-test/kotlin/net/corda/node/persistence/H2SecurityTests.kt
# node/src/integration-test/kotlin/net/corda/node/services/messaging/ArtemisMessagingTest.kt
# node/src/integration-test/kotlin/net/corda/node/services/network/NetworkMapTest.kt
# node/src/integration-test/kotlin/net/corda/services/messaging/AdditionP2PAddressModeTest.kt
# node/src/main/kotlin/net/corda/node/services/schema/NodeSchemaService.kt
# samples/attachment-demo/src/integration-test/kotlin/net/corda/attachmentdemo/AttachmentDemoTest.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/NodeBasedTest.kt
|
2018-11-27 16:55:40 +00:00 |
|
