sollecitom 9a69a36904 Merge remote-tracking branch 'remotes/open/master' into merges/may-14-15-21 ...

# 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

2018-05-14 15:56:43 +01:00

..

_static

CORDA-966 - RELEASE - Update static versions for V3

2018-03-12 13:40:34 +00:00

_templates

Introduced copyright in all source files. (#519)

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

design

Merge pull request #548 from corda/MarkOldfield-patch-1

2018-04-25 11:31:55 +02:00

example-code

Merge remote-tracking branch 'remotes/open/master' into merges/may-14-15-21

2018-05-14 15:56:43 +01:00

resources

Merge commit '88c12791a81a49bdaab93e6bda4d070d7bf1ac5c' into aslemmer-merge-88c12791a81a49bdaab93e6bda4d070d7bf1ac5c

2018-04-26 10:01:30 +01:00

whitepaper

…

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

…

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 'open/master' into mike-merge-ea81548d6

2018-05-11 16:41:39 +02: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

…

api-service-hub.rst

…

api-states.rst

…

api-testing.rst

Revert "OS merge (#806)"

2018-05-04 16:09:11 +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: fix some broken markup that caused rendering errors and warnings.

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

azure-vm.rst

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

2018-05-11 13:02:40 +02: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

…

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-14-15-21

2018-05-14 15:56:43 +01:00

cheat-sheet.rst

Minor corrections to the V2 cheatsheet.

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

cipher-suites.rst

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

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

clientrpc.rst

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

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

codestyle.rst

Removes R3 references from the docs.

2017-12-12 10:42:48 +00:00

component-library-index.rst

…

conf.py

Generate a PDF version of the docsite. Request from a user in Slack.

2018-03-29 10:48:58 +02:00

contract-catalogue.rst

…

contract-irs.rst

…

contract-upgrade.rst

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

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

contributing.rst

Link back to contributing.md. Instructions on updating docs. Tweaks. (#3064)

2018-05-03 10:31:22 +01:00

corda-api.rst

[CORDA-1035] Flow test API docs

2018-02-22 14:38:02 +00:00

corda-configuration-file.rst

Merge remote-tracking branch 'remotes/open/master' into merges/may-14-15-21

2018-05-14 15:56:43 +01:00

corda-networks-index.rst

[ENT-1825] Document details of cipher suites (#3073)

2018-05-04 14:34:45 +01:00

corda-nodes-index.rst

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

2018-05-03 13:37:39 +01:00

corda-repo-layout.rst

…

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-1704 restructure db migration documentation (#636)

2018-04-11 16:48:25 +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

CORDA-1144 Fix documentation that refers to IRS demo code (#2711)

2018-03-02 15:36:54 +00:00

financial-model.rst

…

flow-cookbook.rst

…

flow-library.rst

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

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

flow-state-machines.rst

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

2018-05-11 13:02:40 +02: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 andrius/os-merge

2018-05-03 13:37:39 +01:00

getting-set-up.rst

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

2018-05-11 13:02:40 +02: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

high-availablility.rst

ENT-1865: Guidelines for creating RPC clients compatible with Hot/Cold node deployment. (#826)

2018-05-14 10:51:04 +01:00

hsm-cert-generator.rst

Initial implementation of the certificate generation tool (#148)

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

index.rst

ENT-1704 restructure db migration documentation (#636)

2018-04-11 16:48:25 +01:00

json.rst

…

key-concepts-consensus.rst

…

key-concepts-contracts.rst

…

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

…

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

…

key-concepts-node.rst

CORDA-990: Flows Draining Mode (#2483)

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

key-concepts-notaries.rst

Makes it clear that notaries are clusters or 1+ nodes.

2018-04-30 14:58:13 +01:00

key-concepts-oracles.rst

…

key-concepts-states.rst

…

key-concepts-time-windows.rst

…

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

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

2018-05-11 13:02:40 +02: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

…

messaging.rst

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

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

network-map.rst

CORDA-866: Implement removal of stale nodes from network (#774)

2018-05-11 17:11:56 +01:00

network-simulator.rst

…

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

Fix database doc - SQL Server / Azure and PostgreSQL (#539)

2018-03-13 11:31:25 +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

ENT-1704 restructure db migration documentation (#636)

2018-04-11 16:48:25 +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

other-index.rst

[ENT-1825] Document details of cipher suites (#3073)

2018-05-04 14:34:45 +01:00

out-of-process-verification.rst

…

permissioning.rst

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

2018-05-11 13:02:40 +02: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

Docs on contributing to Corda

2018-01-25 17:15:36 +00: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

ENT-992: Adding docs for the CRL/CRR (#608)

2018-03-29 10:48:28 +01:00

running-hsm-cert-generator.rst

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

2018-04-03 08:33:22 +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

…

serialization-default-evolution.rst

CORDA-834 - Class default evolution serialisation documentation (#2209)

2018-01-05 17:44:53 +00: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

Merge remote-tracking branch 'open/master' into bogdan-merge-10-05-18

2018-05-10 09:47:54 +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

…

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

AWS marketplace getting started docs

2018-01-22 14:27:35 +00: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

Fixing a small mistake added/uploaded, only one required.

2018-02-13 10:24:06 +00:00

tutorial-building-transactions.rst

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

2018-05-11 13:02:40 +02: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

Remove unnecessary this in sample code + minor changes to contract paragraph

2017-10-06 11:33:58 +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

…

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

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

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

upgrading-cordapps.rst

CORDA-1315 small doc correction (#3079)

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

vault.rst

…

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