mirror of
https://github.com/corda/corda.git
synced 2025-01-31 08:25:50 +00:00
9a69a36904
# Conflicts: # .idea/compiler.xml # constants.properties # experimental/behave/src/main/kotlin/net/corda/behave/network/Network.kt # experimental/behave/src/main/kotlin/net/corda/behave/node/Distribution.kt # experimental/behave/src/test/kotlin/net/corda/behave/service/PostreSQLServiceTests.kt # node-api/src/main/kotlin/net/corda/nodeapi/internal/bridging/AMQPBridgeManager.kt # node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/CordaPersistence.kt # node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/HibernateConfiguration.kt # node-api/src/main/kotlin/net/corda/nodeapi/internal/protonwrapper/netty/AMQPChannelHandler.kt # node-api/src/main/kotlin/net/corda/nodeapi/internal/protonwrapper/netty/AMQPClient.kt # node/src/integration-test/kotlin/net/corda/node/AuthDBTests.kt # node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt # node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt # node/src/main/kotlin/net/corda/node/services/config/ConfigUtilities.kt # node/src/main/kotlin/net/corda/node/services/messaging/MessagingExecutor.kt # node/src/main/kotlin/net/corda/node/services/persistence/AbstractPartyToX500NameAsStringConverter.kt # node/src/main/kotlin/net/corda/node/services/persistence/DBTransactionMappingStorage.kt # node/src/main/kotlin/net/corda/node/utilities/AddOrRemove.kt # node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt # samples/attachment-demo/src/integration-test/kotlin/net/corda/attachmentdemo/AttachmentDemoTest.kt # samples/irs-demo/web/src/test/kotlin/net/corda/irs/web/IrsDemoWebApplicationTests.kt # samples/simm-valuation-demo/src/integration-test/kotlin/net/corda/vega/SimmValuationTest.kt # testing/node-driver/src/main/kotlin/net/corda/testing/driver/Driver.kt # testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/InternalTestUtils.kt # testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/RPCDriver.kt # testing/smoke-test-utils/src/main/kotlin/net/corda/smoketesting/NodeConfig.kt # webserver/src/integration-test/kotlin/net/corda/webserver/WebserverDriverTests.kt