mirror of
https://github.com/corda/corda.git
synced 2025-01-31 00:24:59 +00:00
2ca11d7996
# Conflicts: # .idea/compiler.xml # client/rpc/src/main/kotlin/net/corda/client/rpc/CordaRPCClient.kt # client/rpc/src/main/kotlin/net/corda/client/rpc/internal/CordaRPCClientUtils.kt # docs/source/generating-a-node.rst # finance/src/main/kotlin/net/corda/finance/contracts/asset/CommodityContract.kt # node-api/src/main/kotlin/net/corda/nodeapi/internal/ArtemisMessagingClient.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/services/rpc/RpcSslTest.kt # node/src/main/kotlin/net/corda/node/internal/Node.kt # node/src/main/kotlin/net/corda/node/services/config/ConfigUtilities.kt # node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt # node/src/main/kotlin/net/corda/node/services/config/SslOptions.kt # node/src/main/kotlin/net/corda/node/services/messaging/RPCMessagingClient.kt # node/src/main/kotlin/net/corda/node/services/rpc/NodeLoginModule.kt # tools/shell/src/integration-test/kotlin/net/corda/tools/shell/InteractiveShellIntegrationTest.kt