szymonsztuka 3733e7d715 Merge remote-tracking branch 'remotes/open/master' into merges/CORDA-792 ...

# Conflicts:
#	.idea/compiler.xml
#	build.gradle
#	node/src/integration-test/kotlin/net/corda/node/services/rpc/RpcSslTest.kt
#	node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt
#	node/src/main/kotlin/net/corda/node/shell/CordaAuthenticationPlugin.kt
#	node/src/main/kotlin/net/corda/node/shell/CordaSSHAuthInfo.kt
#	node/src/main/kotlin/net/corda/node/shell/RPCOpsWithContext.kt
#	node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt
#	settings.gradle
#	testing/test-common/src/main/kotlin/net/corda/testing/common/internal/UnsafeCertificatesFactory.kt
#	tools/shell/src/integration-test/kotlin/net/corda/tools/shell/SSHServerTest.kt
#	tools/shell/src/main/java/net/corda/tools/shell/FlowShellCommand.java
#	tools/shell/src/main/java/net/corda/tools/shell/RunShellCommand.java
#	tools/shell/src/main/java/net/corda/tools/shell/StartShellCommand.java
#	tools/shell/src/main/kotlin/net/corda/tools/shell/FlowWatchPrintingSubscriber.kt
#	tools/shell/src/main/kotlin/net/corda/tools/shell/InteractiveShell.kt
#	tools/shell/src/main/kotlin/net/corda/tools/shell/InteractiveShellCommand.kt
#	tools/shell/src/main/kotlin/net/corda/tools/shell/utlities/ANSIProgressRenderer.kt
#	tools/shell/src/main/resources/net/corda/tools/shell/base/login.groovy
#	tools/shell/src/test/kotlin/net/corda/tools/shell/CustomTypeJsonParsingTests.kt
#	tools/shell/src/test/kotlin/net/corda/tools/shell/InteractiveShellTest.kt

2018-03-07 16:49:00 +00:00

..

_static

Merge pull request #352 from corda/colljos-merge-release3-dp-master

2018-01-16 17:33:28 +00:00

_templates

Introduced copyright in all source files. (#519)

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

design

Mkit ent 1133 certificate hierarchy (#131)

2018-02-07 12:59:07 +00:00

example-code

Introduced copyright in all source files. (#519)

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

resources

Merge remote-tracking branch 'remotes/open/master' into merges/march-1-15-20

2018-03-01 15:36:40 +00:00

whitepaper

added correct 'figure' translation for traditional chinese.

2017-05-08 14:36:29 +02: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

Merge release-v1 onto master (mostly documentation changes) (#1797)

2017-10-03 17:32:11 +01:00

api-flows.rst

Merge remote-tracking branch 'remotes/open/master' into merges/march-6-16-56

2018-03-06 16:59:13 +00:00

api-identity.rst

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

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

api-persistence.rst

ENT-1282: create standalone db migration tool (#356)

2018-01-24 11:55:43 +00:00

api-rpc.rst

Moves code sections in tutorials to code files.

2017-10-01 23:33:15 +01: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-1035] Flow test API docs

2018-02-22 14:38:02 +00: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

Minor fix to "API: Vault Query" docsite page (#1910)

2017-12-14 14:09:26 +00:00

aws-vm.rst

AWS marketplace getting started docs

2018-01-22 14:27:35 +00:00

azure-vm.rst

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

2017-11-01 14:25:48 +00: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

Fixes formatting.

2018-01-19 13:43:17 +00:00

building-the-docs.rst

Removed old information about Dokka from the building docs documentation.

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

changelog.rst

Merge remote-tracking branch 'remotes/open/master' into merges/march-1-15-20

2018-03-01 15:36:40 +00:00

cheat-sheet.rst

Minor corrections to the V2 cheatsheet.

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

clientrpc.rst

Merge remote-tracking branch 'remotes/open/master' into mnesbit-merge-20180131

2018-01-31 10:37:44 +00:00

codestyle.rst

Removes R3 references from the docs.

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

component-library-index.rst

Further docsite changes, including reorganising the index.

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

conf.py

[CORDA-1035] Flow test API docs

2018-02-22 14:38:02 +00: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

Moves code sections in tutorials to code files.

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

contributing.rst

Docs on contributing to Corda

2018-01-25 17:15:36 +00: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 'open/master' into os-merge-020318

2018-03-02 10:42:03 +00:00

corda-networks-index.rst

Update identity docs (#2319)

2018-02-28 18:04:08 +00:00

corda-nodes-index.rst

[CORDA-827] Improved unit tests coverage and documentation (#2229)

2017-12-13 17:09:09 +00:00

corda-repo-layout.rst

Moves code sections in tutorials to code files.

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

cordapp-build-systems.rst

Fix merge conflicts.

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

cordapp-custom-serializers.rst

CORDA-553 - Remove CordaCustomSerializer annotation

2017-12-07 21:15:33 +00:00

cordapp-overview.rst

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

2017-11-16 15:31:52 +00: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

Adds a 'provision the certificates' step to the Windows deployment instructions.

2018-02-26 09:21:27 +00:00

event-scheduling.rst

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

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

faq.rst

Changes master docs to reflect M12 last-minute changes.

2017-06-09 13:59:39 +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

* Move CompositeSignaturesWithKeys into net.corda.core.crypto package.

2017-10-02 16:03:07 +01:00

flow-testing.rst

[CORDA-1035] Testing api KDoc Updates (#2584)

2018-02-28 13:26:49 +00:00

generating-a-node.rst

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

2018-03-02 10:42:03 +00:00

getting-set-up.rst

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

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

glossary.rst

Corrects glossary.

2018-01-17 17:54:13 +00: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 os-merge-020318

2018-03-02 10:42:03 +00:00

hello-world-state.rst

Updates tutorials (general fixes, link to solutions repos)

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

hello-world-template.rst

Wrong file name.

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

hsm-cert-generator.rst

Initial implementation of the certificate generation tool (#148)

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

index.rst

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

2017-11-16 15:31:52 +00: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

Further docsite changes, including reorganising the index.

2017-06-07 16:14:01 +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

Further docsite changes, including reorganising the index.

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

key-concepts-oracles.rst

Further docsite changes, including reorganising the index.

2017-06-07 16:14:01 +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

Docsite reorg ahead of beta launch.

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

key-concepts-transactions.rst

Further docsite changes, including reorganising the index.

2017-06-07 16:14:01 +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

Rename the inbox (#2360)

2018-01-17 16:06:31 +00:00

network-map.rst

CORDA-1006: Undoing the wiring of maxMessageSize as it's not correctly implemented and updating the docs to clarify its status. (#2501) (#2729)

2018-03-05 17:26:08 +00: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 mike-merge-80c00b920b

2018-03-02 15:17:32 +01:00

node-database.rst

Update documentation of Postgres support

2018-02-27 14:44:17 +00:00

node-explorer.rst

Merge from R3 Corda 3.0 Dev Preview release branch to master

2018-01-13 11:00:01 +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

oracles.rst

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

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

other-index.rst

Docs on contributing to Corda

2018-01-25 17:15:36 +00:00

out-of-process-verification.rst

Docsite reorg ahead of beta launch.

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

permissioning.rst

Fix permissioning doc (#2755)

2018-03-07 10:39:03 +00: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

Backported removed release notes entry.

2018-03-01 16:53:51 +00:00

release-process-index.rst

Docs on contributing to Corda

2018-01-25 17:15:36 +00:00

running-a-node.rst

Merge commit '86fb1ed852c69121f989c9eeea92cfb4c27f9d13' into aslemmer-merge-19-Feb

2018-02-19 16:14:43 +00:00

running-a-notary.rst

Raft Notary: bootstrap command line flag

2017-11-14 13:51:21 +00:00

running-dev-keystore-generator.rst

Making BasicConstraints a critical extension (#420)

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

running-doorman.rst

Implementing dual execution mode of the HSM signing service (#380)

2018-02-08 16:54:07 +00:00

running-hsm-cert-generator.rst

Addressing multiple key groups. Removing redundant config parameters for private key passwords (#409)

2018-01-25 16:40:42 +00:00

running-signing-service.rst

Renaming configuration sections for doorman and network map (#472)

2018-03-02 11:41:00 +00:00

secure-coding-guidelines.rst

Docsite reorg ahead of beta launch.

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

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 aslemmer-merge-19-Feb

2018-02-20 15:52:09 +00:00

setting-up-a-corda-network.rst

CORDA-1048: Making it simpler to move an existing local deployment of nodes to across different machines. (#2672)

2018-03-01 21:24:10 +00:00

shell.rst

Merge remote-tracking branch 'remotes/open/master' into merges/CORDA-792

2018-03-07 16:49:00 +00:00

signing-service.rst

Adding HSM signing service docs (#122)

2017-11-24 11:32:12 +00:00

soft-locking.rst

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

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

testing.rst

Changed system and environmental variables to only be parsed as config if they're prefixed with "corda." e.g., to override "p2pPort" would now take a "corda.p2pPort" from system or environmental variables.

2018-03-01 16:37:15 +00:00

tools-index.rst

AWS marketplace getting started docs

2018-01-22 14:27:35 +00:00

troubleshooting.rst

CORDA-1145 - troubleshooting updates (#2738)

2018-03-06 10:28:10 +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

Updates tutorials (general fixes, link to solutions repos)

2017-12-13 16:22:40 +00: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

Adds links to referenced code files.

2018-02-01 18:34:44 +00: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

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

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

tutorial-custom-notary.rst

Fixed AbstractNode to load custom notary services properly (#1720)

2017-10-13 10:36:25 +01: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

Adds a caveat regarding the inability to record a transaction twice.

2017-12-21 14:42:18 +00:00

tutorial-tear-offs.rst

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

2018-03-02 15:36:54 +00: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

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

2018-01-25 17:51:13 +00:00

upgrading-cordapps.rst

CORDA-696 - Create separate transaction types for contract upgrade transactions (#2589)

2018-02-26 11:29:25 +00: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: discuss zone constraints, flow drains and more upgrade related topics (#2585)

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