sollecitom de0c69a888 Merge remote-tracking branch 'remotes/open/master' into merges/may-29-16-48 ...

# Conflicts:
#	node/src/integration-test/kotlin/net/corda/node/services/RaftNotaryServiceTests.kt
#	node/src/integration-test/kotlin/net/corda/node/services/network/PersistentNetworkMapCacheTest.kt
#	node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
#	node/src/main/kotlin/net/corda/node/internal/Node.kt
#	node/src/main/kotlin/net/corda/node/services/identity/PersistentIdentityService.kt
#	node/src/main/kotlin/net/corda/node/services/persistence/DBTransactionMappingStorage.kt
#	node/src/main/kotlin/net/corda/node/services/persistence/DBTransactionStorage.kt
#	node/src/main/kotlin/net/corda/node/services/vault/NodeVaultService.kt
#	node/src/test/kotlin/net/corda/node/internal/NodeTest.kt
#	node/src/test/kotlin/net/corda/node/services/identity/PersistentIdentityServiceTests.kt
#	node/src/test/kotlin/net/corda/node/services/messaging/ArtemisMessagingTest.kt
#	node/src/test/kotlin/net/corda/node/services/persistence/DBCheckpointStorageTests.kt
#	node/src/test/kotlin/net/corda/node/services/persistence/DBTransactionStorageTests.kt
#	node/src/test/kotlin/net/corda/node/services/persistence/HibernateConfigurationTest.kt
#	node/src/test/kotlin/net/corda/node/services/persistence/NodeAttachmentStorageTest.kt
#	node/src/test/kotlin/net/corda/node/services/schema/HibernateObserverTests.kt
#	node/src/test/kotlin/net/corda/node/services/transactions/PersistentUniquenessProviderTests.kt
#	node/src/test/kotlin/net/corda/node/services/transactions/RaftTransactionCommitLogTests.kt
#	node/src/test/kotlin/net/corda/node/services/vault/VaultQueryTests.kt
#	node/src/test/kotlin/net/corda/node/utilities/ObservablesTests.kt
#	samples/irs-demo/cordapp/src/test/kotlin/net/corda/irs/api/NodeInterestRatesTest.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt

2018-05-29 17:17:08 +01:00

..

_static

Merge remote-tracking branch 'open/master' into os-merge-3136e97

2018-05-24 13:20:16 +01:00

_templates

Introduced copyright in all source files. (#519)

2018-03-06 17:29:21 +00:00

design

ENT-1959: add a default value for mutualExclusionConfiguration.machineName (#877)

2018-05-25 11:13:53 +01:00

example-code

Merge remote-tracking branch 'remotes/open/master' into parkri-os-merge-20180525-1

2018-05-25 14:19:15 +01:00

resources

Merge remote-tracking branch 'remotes/open/master' into parkri-os-merge-20180525-1

2018-05-25 14:19:15 +01:00

whitepaper

Moves whitepapers. (#3217)

2018-05-22 15:38:43 +01:00

api-contract-constraints.rst

Docs: discuss zone constraints, flow drains and more upgrade related topics (#2585)

2018-02-21 15:33:28 +01:00

api-contracts.rst

Joel api contracts (#1611)

2017-09-22 16:51:14 +01:00

api-core-types.rst

Docs: fix some broken markup that caused rendering errors and warnings.

2018-05-11 13:02:40 +02:00

api-flows.rst

Merge remote-tracking branch 'remotes/open/master' into parkri-os-merge-20180525-1

2018-05-25 14:19:15 +01:00

api-identity.rst

CORDA-1175 Docs numbering issue and counterparty consistency. (#2744)

2018-03-06 14:22:38 +00:00

api-persistence.rst

Merge remote-tracking branch 'open/master' into mike-merge-ea81548d6

2018-05-11 16:41:39 +02:00

api-rpc.rst

Moves code sections in tutorials to code files.

2017-10-01 23:33:15 +01:00

api-scanner.rst

CORDA-1496 Add api-scanner documentation (#3184)

2018-05-24 15:43:58 +02:00

api-service-hub.rst

Moves code sections in tutorials to code files.

2017-10-01 23:33:15 +01:00

api-states.rst

Joel states api (#1605)

2017-09-22 15:14:16 +01:00

api-testing.rst

[CORDA-1341]: Ensure API can be called concurrently wrt transactions. (#3235)

2018-05-29 15:25:34 +01:00

api-transactions.rst

CORDA-1038 Update verifySignaturesExcept in api-transactions.rst (#2546)

2018-02-16 12:32:53 +00:00

api-vault-query.rst

Docs: fix some broken markup that caused rendering errors and warnings.

2018-05-11 13:02:40 +02:00

aws-vm.rst

Docs: re-organise the toctree a bit more and introduce a design section

2018-05-15 16:59:35 +02:00

azure-vm.rst

Docs: re-organise the toctree a bit more and introduce a design section

2018-05-15 16:59:35 +02:00

blob-inspector.rst

CORDA-1238: Moved the blob inspector out of experimental and wired it to JackonSupport (#3224)

2018-05-24 18:26:55 +01:00

bridge-configuration-file.rst

ENT-1959: add a default value for mutualExclusionConfiguration.machineName (#877)

2018-05-25 11:13:53 +01:00

building-a-cordapp-index.rst

Docs: move serialisation into the CorDapp section. Fix some markup issues (#2429)

2018-01-30 10:59:03 +01:00

building-a-cordapp-samples.rst

Re-introduce demo docs (#1981)

2017-11-22 15:39:48 +00:00

building-against-master.rst

Docs: fix some broken markup that caused rendering errors and warnings.

2018-05-11 13:02:40 +02:00

building-the-docs.rst

Removed old information about Dokka from the building docs documentation.

2017-03-30 12:23:20 +01:00

certificate-revocation.rst

Adding revocation reasons to docs. (#670)

2018-04-03 16:59:40 +01:00

changelog.rst

Merge remote-tracking branch 'remotes/open/master' into merges/may-29-16-48

2018-05-29 17:17:08 +01:00

cheat-sheet.rst

Minor corrections to the V2 cheatsheet.

2017-12-08 17:00:31 +00:00

cipher-suites.rst

Fixing node keys bullet points (#3207)

2018-05-24 14:30:36 +01:00

clientrpc.rst

[CORDA-1264]: Mask internal errors if devMode is false. (#871)

2018-05-23 09:55:24 +01:00

codestyle.rst

Clarifying the ident width in the code style guide (#3190)

2018-05-18 17:28:40 +01:00

component-library-index.rst

Further docsite changes, including reorganising the index.

2017-06-07 16:14:01 +01:00

conf.py

Added favicon to docs.corda.net (#3199)

2018-05-21 11:49:56 +01:00

contract-catalogue.rst

Pluggable cash selection using H2 as default implementation. (#1300)

2017-08-22 18:09:23 +01:00

contract-irs.rst

Further docsite changes, including reorganising the index.

2017-06-07 16:14:01 +01:00

contract-upgrade.rst

Docs: fix some broken markup that caused rendering errors and warnings.

2018-05-11 13:02:40 +02:00

contributing.rst

CORDA-1496 Add api-scanner documentation (#3184)

2018-05-24 15:43:58 +02:00

corda-api.rst

CORDA-1496 Add api-scanner documentation (#3184)

2018-05-24 15:43:58 +02:00

corda-bridge-component.rst

First pass doc on the bridge.conf configuration file.

2018-05-17 08:52:49 +01:00

corda-configuration-file.rst

Resloved merge conflicts.

2018-05-29 11:32:43 +01:00

corda-networks-index.rst

Docs: re-organise the toctree a bit more and introduce a design section

2018-05-15 16:59:35 +02:00

corda-nodes-index.rst

Merge commit '8cac69d2522ae37b2bb976347b5aad853c04795a' into mike-merge-413f476a3

2018-05-15 18:09:16 +02:00

corda-repo-layout.rst

Update references to point to new repo and remove other redundant references. (#3151)

2018-05-15 17:09:50 +01:00

cordapp-build-systems.rst

Fix merge conflicts.

2018-02-28 14:12:54 +00:00

cordapp-custom-serializers.rst

Docs: fix some broken markup that caused rendering errors and warnings.

2018-05-11 13:02:40 +02:00

cordapp-overview.rst

Reflects tutorial changes and CorDapp build docs changes from release-V1.

2017-11-16 15:31:52 +00:00

crr-submission-tool.rst

ENT-992: Introducing the CRR submission tool (#633)

2018-04-03 08:33:22 +01:00

database-migration.rst

ENT-1940 Improve error checking for the db migration tool (#868)

2018-05-22 13:19:50 +01:00

demobench.rst

[CORDA-446] Clean up other mentions of network map node and logic (#1974)

2017-11-01 14:25:48 +00:00

deploying-a-node.rst

Docs: fix some broken markup that caused rendering errors and warnings.

2018-05-11 13:02:40 +02:00

event-scheduling.rst

Removes outdated information from scheduling tutorial. (#3175)

2018-05-17 09:09:07 +01:00

financial-model.rst

Further docsite changes, including reorganising the index.

2017-06-07 16:14:01 +01:00

flow-cookbook.rst

Flow cookbook added and merged into flow API page.

2017-06-22 16:13:54 +01:00

flow-library.rst

CORDA-1175 Docs numbering issue and counterparty consistency. (#2744)

2018-03-06 14:22:38 +00:00

flow-state-machines.rst

Replace timestamp with time-window (#3211)

2018-05-24 16:06:33 +01:00

flow-testing.rst

Remove superfluous registerInitiatedFlow calls from tutorial and example tests (#2944)

2018-04-20 16:56:27 +01:00

generating-a-node.rst

Merge remote-tracking branch 'open/master' into tudor-merge-21-05-18

2018-05-21 13:49:59 +01:00

getting-set-up.rst

Merge remote-tracking branch 'remotes/open/master' into merges/may-29-16-48

2018-05-29 17:17:08 +01:00

hello-world-flow.rst

Updates tutorials (general fixes, link to solutions repos)

2017-12-13 16:22:40 +00:00

hello-world-introduction.rst

Reflects tutorial changes and CorDapp build docs changes from release-V1.

2017-11-16 15:31:52 +00:00

hello-world-running.rst

Merge remote-tracking branch 'open/master' into mike-merge-ea81548d6

2018-05-11 16:41:39 +02:00

hello-world-state.rst

CORDA-1201 Remove duplicated doc section. (#2924)

2018-04-11 11:08:20 +01:00

hello-world-template.rst

Wrong file name.

2018-02-27 10:21:03 +00:00

hot-cold-deployment.rst

ENT-1959: add a default value for mutualExclusionConfiguration.machineName (#877)

2018-05-25 11:13:53 +01:00

hsm-cert-generator.rst

Initial implementation of the certificate generation tool (#148)

2018-01-23 11:50:03 +00:00

hsm-crl-generator.rst

ENT-1883 Adding the CRL generator (#857)

2018-05-23 07:48:53 +01:00

index.rst

Merge remote-tracking branch 'open/master' into os-merge-2907250

2018-05-21 10:31:57 +01:00

json.rst

Fixes docsite dead links.

2017-09-29 17:42:49 +01:00

key-concepts-consensus.rst

Further docsite changes, including reorganising the index.

2017-06-07 16:14:01 +01:00

key-concepts-contracts.rst

Replace timestamp with time-window (#3211)

2018-05-24 16:06:33 +01:00

key-concepts-ecosystem.rst

Removes old network diagram. Consolidates two sections on node naming. Moves contract constraints to API section.

2017-12-08 17:00:08 +00:00

key-concepts-flows.rst

Further docsite changes, including reorganising the index.

2017-06-07 16:14:01 +01:00

key-concepts-identity.rst

Removes old network diagram. Consolidates two sections on node naming. Moves contract constraints to API section.

2017-12-08 17:00:08 +00:00

key-concepts-ledger.rst

Further docsite changes, including reorganising the index.

2017-06-07 16:14:01 +01:00

key-concepts-node.rst

CORDA-990: Flows Draining Mode (#2483)

2018-02-12 16:13:43 +00:00

key-concepts-notaries.rst

Docs: Add a section on what data is visible to notaries (#3159)

2018-05-23 08:59:58 +01:00

key-concepts-oracles.rst

Replace timestamp with time-window (#3211)

2018-05-24 16:06:33 +01:00

key-concepts-states.rst

Further docsite changes, including reorganising the index.

2017-06-07 16:14:01 +01:00

key-concepts-time-windows.rst

Changes master docs to reflect M12 last-minute changes.

2017-06-09 13:59:39 +01:00

key-concepts-tradeoffs.rst

Docs: fix some broken markup that caused rendering errors and warnings.

2018-05-11 13:02:40 +02:00

key-concepts-transactions.rst

Replace timestamp with time-window (#3211)

2018-05-24 16:06:33 +01:00

key-concepts.rst

Removes old network diagram. Consolidates two sections on node naming. Moves contract constraints to API section.

2017-12-08 17:00:08 +00:00

loadtesting.rst

Added throttling to the load test tool and added stability test. (#847)

2017-06-16 15:30:11 +01:00

messaging.rst

CORDA-1343 Make the RPCClient ssl constructors public. Clean up broke… (#3039)

2018-05-21 13:05:08 +03:00

network-map.rst

Merge remote-tracking branch 'open/master' into kat-merge-20180517

2018-05-17 15:04:51 +01:00

network-simulator.rst

Further docsite changes, including reorganising the index.

2017-06-07 16:14:01 +01:00

node-administration.rst

Merge remote-tracking branch 'open/master' into merge/tudor-26-03

2018-03-26 14:07:28 +01:00

node-database.rst

Merge remote-tracking branch 'open/master' into os-merge-3136e97

2018-05-24 13:20:16 +01:00

node-explorer.rst

Merge remote-tracking branch 'open/master' into andrius-merge-03-09

2018-03-09 16:09:59 +00:00

node-internals-index.rst

Docs: move serialisation into the CorDapp section. Fix some markup issues (#2429)

2018-01-30 10:59:03 +01:00

node-services.rst

Some cleanup after network map removal (#2006)

2017-11-07 12:16:49 +00:00

node-structure.rst

Splits node structure from node creation. Tweaks. (#3015)

2018-04-30 15:19:59 +01:00

operations-guide.rst

Bogdan hotcold operational guide (#855)

2018-05-24 11:42:02 +01:00

oracles.rst

[CORDA-1292] Add CordaService testing documentation and improve tests in irs-demo (#2929)

2018-04-06 09:22:58 +01:00

out-of-process-verification.rst

Docsite reorg ahead of beta launch.

2017-06-05 13:37:23 +01:00

permissioning.rst

CORDA-1510 - Allow Doorman and NetworkMap to be configured independently (#3220)

2018-05-25 11:37:20 +01:00

quickstart-index.rst

Showcase link in Quickstart guide. Remove Utilities link (merged with Samples).

2018-02-26 16:47:53 +00:00

release-notes.rst

Merge remote-tracking branch 'open/master' into mike-merge-ea81548d6

2018-05-11 16:41:39 +02:00

release-process-index.rst

CORDA-1496 Add api-scanner documentation (#3184)

2018-05-24 15:43:58 +02:00

running-a-node.rst

Merge remote-tracking branch 'open/master' into kat-merge-20180508

2018-05-08 12:10:22 +01:00

running-a-notary.rst

Docs: fix some broken markup that caused rendering errors and warnings.

2018-05-11 13:02:40 +02:00

running-crr-submission-tool.rst

ENT-992: Introducing the CRR submission tool (#633)

2018-04-03 08:33:22 +01:00

running-dev-keystore-generator.rst

Making BasicConstraints a critical extension (#420)

2018-02-08 14:30:20 +00:00

running-doorman.rst

Fixing docs indentation for CRL (#864)

2018-05-21 17:05:14 +01:00

running-hsm-cert-generator.rst

ENT-1883 Adding the CRL generator (#857)

2018-05-23 07:48:53 +01:00

running-hsm-crl-generator.rst

ENT-1883 Adding the CRL generator (#857)

2018-05-23 07:48:53 +01:00

running-signing-service.rst

ENT-1548: Improve docs for hsm (#805)

2018-05-04 15:58:36 +01:00

secure-coding-guidelines.rst

Docsite reorg ahead of beta launch.

2017-06-05 13:37:23 +01:00

serialization-default-evolution.rst

ENT-1933: make NetworkParameters serialization compatible (#3234)

2018-05-25 17:14:00 +01:00

serialization-enum-evolution.rst

Enum evolution documentation (#2189)

2018-01-05 19:30:17 +00:00

serialization.rst

Merge remote-tracking branch 'open/master' into kat-merge-28-03-18

2018-03-28 09:47:49 +01:00

setting-up-a-corda-network.rst

CORDA-1261: Document bootstrapping cannot use the same H2 port (#3032)

2018-04-30 11:05:57 +01:00

shell.rst

Resloved merge conflicts.

2018-05-29 11:32:43 +01:00

signing-service.rst

ENT-1608: Check that notary identities are registered (#799)

2018-05-03 11:09:11 +01:00

soft-locking.rst

Improvements to Vault Query Service soft locked state querying (#1174)

2017-08-04 17:23:31 +01:00

testing.rst

ENT-1566 Fixes for db integration tests + ENT-1575 db migrations for db attachment changes (#521)

2018-03-09 09:52:44 +00:00

tools-index.rst

CORDA-1238: Moved the blob inspector out of experimental and wired it to JackonSupport (#3224)

2018-05-24 18:26:55 +01:00

troubleshooting.rst

Removes the glossary and FAQ. Points people to StackOverflow for troubleshooting.

2018-03-16 13:41:38 +00:00

tut-two-party-contract.rst

Updates tutorials (general fixes, link to solutions repos)

2017-12-13 16:22:40 +00:00

tut-two-party-flow.rst

Update tut-two-party-flow.rst (#3133)

2018-05-14 12:09:53 +01:00

tut-two-party-introduction.rst

Reflects tutorial changes and CorDapp build docs changes from release-V1.

2017-11-16 15:31:52 +00:00

tutorial-attachments.rst

Update tutorial-attachments.rst

2018-05-23 13:44:28 +01:00

tutorial-building-transactions.rst

Replace timestamp with time-window (#3211)

2018-05-24 16:06:33 +01:00

tutorial-clientrpc-api.rst

Merge from R3 Corda 3.0 Dev Preview release branch to master

2018-01-13 11:00:01 +00:00

tutorial-contract.rst

Replace timestamp with time-window (#3211)

2018-05-24 16:06:33 +01:00

tutorial-cordapp.rst

Docs: fix some broken markup that caused rendering errors and warnings.

2018-05-11 13:02:40 +02:00

tutorial-custom-notary.rst

CORDA-1171: When a double-spend occurs, do not send the consuming transaction id and requesting party back to the client - this might lead to privacy leak. Only the transaction id hash is now returned.

2018-03-09 16:00:52 +00:00

tutorial-integration-testing.rst

Moves code sections in tutorials to code files.

2017-10-01 23:33:15 +01:00

tutorial-observer-nodes.rst

Clearer caveat about using observable states.

2018-04-03 09:11:35 +01:00

tutorial-tear-offs.rst

Docs: fix some broken markup that caused rendering errors and warnings.

2018-05-11 13:02:40 +02:00

tutorial-test-dsl.rst

Move the CommercialPaperTest examples to a location where it'll be run by gradle/ci. Make sure the tests pass, even the example tests that are intended to fail, so these files are kept up to date as the code changes.

2018-01-15 17:56:21 +01:00

tutorials-index.rst

Clarifies that only the first two tutorials are related and form a sequence.

2017-12-13 17:46:31 +00:00

upgrade-notes.rst

Resloved merge conflicts.

2018-05-29 11:32:43 +01:00

upgrading-cordapps.rst

CORDA-1315 small doc correction (#3079)

2018-05-09 13:52:58 +01:00

vault.rst

Cleaned up incorrect references to vault query and persistence. (#933)

2017-06-28 16:00:39 +01:00

versioning.rst

Updates versioning docs.

2018-01-16 15:29:26 +00:00

writing-a-cordapp.rst

Docs: fix some broken markup that caused rendering errors and warnings.

2018-05-11 13:02:40 +02:00