mirror of
https://github.com/corda/corda.git
synced 2025-03-17 01:25:25 +00:00
598e3a327a
# Conflicts: # build.gradle # core/src/main/kotlin/net/corda/core/schemas/PersistentTypes.kt # finance/src/main/kotlin/net/corda/finance/schemas/CashSchemaV1.kt # finance/src/main/kotlin/net/corda/finance/schemas/CommercialPaperSchemaV1.kt # finance/src/main/resources/migration/cash.changelog-init.xml # finance/src/main/resources/migration/cash.changelog-master.xml # finance/src/main/resources/migration/commercial-paper.changelog-init.xml # finance/src/main/resources/migration/commercial-paper.changelog-master.xml # finance/src/main/resources/migration/commercial-paper.changelog-v1.xml # node-api/src/main/kotlin/net/corda/nodeapi/internal/MigrationHelpers.kt # node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/SchemaMigration.kt # node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt # node/src/main/kotlin/net/corda/node/internal/schemas/NodeInfoSchema.kt # node/src/main/kotlin/net/corda/node/services/persistence/DBCheckpointStorage.kt # node/src/main/kotlin/net/corda/node/services/schema/NodeSchemaService.kt # node/src/main/resources/migration/common.changelog-init.xml # node/src/main/resources/migration/common.changelog-master.xml # node/src/main/resources/migration/node-core.changelog-init.xml # node/src/main/resources/migration/node-core.changelog-master.xml # node/src/main/resources/migration/node-core.changelog-pkey.xml # node/src/main/resources/migration/node-core.changelog-postgres-blob.xml # node/src/main/resources/migration/node-core.changelog-tx-mapping.xml # node/src/main/resources/migration/node-core.changelog-v3.xml # node/src/main/resources/migration/node-core.changelog-v4.xml # node/src/main/resources/migration/node-info.changelog-init.xml # node/src/main/resources/migration/node-info.changelog-master.xml # node/src/main/resources/migration/node-info.changelog-v1.xml # node/src/main/resources/migration/node-info.changelog-v2.xml # node/src/main/resources/migration/node-notary.changelog-init.xml # node/src/main/resources/migration/node-notary.changelog-master.xml # node/src/main/resources/migration/node-notary.changelog-pkey.xml # node/src/main/resources/migration/node-notary.changelog-v1.xml # node/src/main/resources/migration/vault-schema.changelog-init.xml # node/src/main/resources/migration/vault-schema.changelog-master.xml # node/src/main/resources/migration/vault-schema.changelog-pkey.xml # testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt