Thomas Schroeter baabf8ceb9 Merge remote-tracking branch 'open-source/master' into thomas/os-merge-2018-07-11 ...

Conflicts:
	finance/src/integration-test/kotlin/net/corda/finance/flows/CashConfigDataFlowTest.kt
	node/src/integration-test/kotlin/net/corda/node/BootTests.kt
	node/src/integration-test/kotlin/net/corda/node/NodeUnloadHandlerTests.kt
	node/src/integration-test/kotlin/net/corda/node/flows/FlowRetryTest.kt
	tools/shell/src/integration-test/kotlin/net/corda/tools/shell/InteractiveShellIntegrationTest.kt
	tools/shell/src/integration-test/kotlin/net/corda/tools/shell/SSHServerTest.kt
	webserver/src/integration-test/kotlin/net/corda/webserver/WebserverDriverTests.kt

2018-07-11 14:56:03 +01:00

..

_static

Revert "[ENT-2248]: Put back DP3 docs in the dropdown. (#1245)" (#1247)

2018-07-10 14:05:58 +01:00

_templates

Use absolute path for versions endpoint in docs (#1242)

2018-07-10 13:24:23 +01:00

design

Merge from O/S

2018-07-05 19:09:25 +01:00

example-code

Removing warnings

2018-07-05 15:45:28 +01:00

resources

Merge remote-tracking branch 'open-source/master' into thomas/os-merge-2018-07-11

2018-07-11 14:56:03 +01:00

running-a-notary-cluster

Docs: moved notary setup guides from tutorials to operations. (#1162)

2018-07-03 10:07:50 +01:00

whitepaper

Moves whitepapers. (#3217)

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

api-contract-constraints.rst

[ENT-1955] Documentation fixes (#3417)

2018-06-21 16:57:30 +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 commit '02348a584d56cdb562581d99be5b56348f7d1001' into chrisr3-os-merge

2018-06-23 00:06:11 +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 'remotes/open/master' into merges/os-2018-06-08-szymon

2018-06-08 10:57:50 +01:00

api-rpc.rst

Moves code sections in tutorials to code files.

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

api-scanner.rst

[ENT-1955] Documentation fixes (#3417)

2018-06-21 16:57:30 +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

[ENT-1955] Documentation fixes (#3417)

2018-06-21 16:57:30 +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

[ENT-1955] Documentation fixes (#3417)

2018-06-21 16:57:30 +01:00

aws-vm-explore.rst

Testnet documentation pages (#3287)

2018-07-11 14:12:52 +01: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-explore.rst

Testnet documentation pages (#3287)

2018-07-11 14:12:52 +01:00

azure-vm.rst

[ENT-1955] Documentation fixes (#3417)

2018-06-21 16:57:30 +01:00

blob-inspector.rst

ENT-2160: Documentation updates for tools we ship with GA release. (#1131) (#1191)

2018-07-03 17:11:48 +01:00

building-a-cordapp-index.rst

Consolidates and extends debugging information. (#3548)

2018-07-10 15:17:59 +01:00

building-a-cordapp-samples.rst

Re-introduce demo docs (#1981)

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

building-against-master.rst

Adds instructions for building Gradle plugins (#3372)

2018-06-14 15:57:49 +01:00

building-the-docs.rst

Workaround if six is already installed. (#3320)

2018-06-07 16:13:59 +01:00

certificate-revocation.rst

ENT-1955, ENT-2227 - Documentation scrub and TOC update (#1209)

2018-07-05 15:00:43 +01:00

changelog.rst

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

2018-07-10 11:19:23 +01:00

cheat-sheet.rst

Minor corrections to the V2 cheatsheet.

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

cipher-suites.rst

K1 is supported by TLS (permissioning.rst) and identify Sphincs as experimental due to a BC 1.58 issue which needs investigation. (#3269)

2018-05-30 17:38:33 +01:00

clientrpc.rst

Merge commit '02348a584d56cdb562581d99be5b56348f7d1001' into chrisr3-os-merge

2018-06-23 00:06:11 +01:00

codestyle.rst

[ENT-1955] Documentation fixes (#3417)

2018-06-21 16:57:30 +01:00

component-library-index.rst

Removed flow-library doc page as it's redundant (#3307)

2018-06-05 21:43:03 +01:00

conf.py

Merge remote-tracking branch 'remotes/open/master' into merges/july-10-15-51

2018-07-10 15:51:33 +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

Add DCO requirement to contributing docs. (#3263)

2018-05-30 12:35:51 +01:00

corda-api.rst

CORDA-1567 Remove all traces of the out-of-process verifier (#3424)

2018-06-25 13:01:33 +01:00

corda-configuration-file.rst

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

2018-07-10 11:19:23 +01:00

corda-firewall-component.rst

Bridge to Firewall renames

2018-07-05 15:20:28 +01:00

corda-firewall.rst

Bridge to Firewall renames

2018-07-05 15:20:28 +01:00

corda-networks-index.rst

Merge remote-tracking branch 'open-source/master' into thomas/os-merge-2018-07-11

2018-07-11 14:56:03 +01:00

corda-nodes-index.rst

Merge from O/S

2018-07-05 19:09:25 +01:00

corda-repo-layout.rst

CORDA-1567 Remove all traces of the out-of-process verifier (#3424)

2018-06-25 13:01:33 +01:00

corda-testnet-intro.rst

Testnet documentation pages (#3287)

2018-07-11 14:12:52 +01:00

cordapp-build-systems.rst

Fix merge conflicts.

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

cordapp-custom-serializers.rst

CORDA-1641 - Add Java example to proxy serializer documentation (#3390)

2018-06-18 16:09:31 +01:00

cordapp-overview.rst

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

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

database-management.rst

Added example command to create dummy JAR file with migration for upgrading Cordapp from OS to ENT. (#1187)

2018-07-06 10:56:01 +01:00

debugging-a-cordapp.rst

Consolidates and extends debugging information. (#3548)

2018-07-10 15:17:59 +01:00

demobench.rst

ENT-2160: Documentation updates for tools we ship with GA release. (#1131) (#1191)

2018-07-03 17:11:48 +01:00

deploying-a-node.rst

ENT-2174 documentation (#1145)

2018-07-02 15:24:12 +01:00

deterministic-modules.rst

Merge from O/S

2018-07-05 19:09:25 +01:00

event-scheduling.rst

Fix missing snippets (#1154)

2018-06-29 13:08:09 +01:00

financial-model.rst

Further docsite changes, including reorganising the index.

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

firewall-configuration-file.rst

Bridge to Firewall renames

2018-07-05 15:20:28 +01:00

flow-cookbook.rst

Flow cookbook added and merged into flow API page.

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

flow-state-machines.rst

Docs: flowTracker to progressTracker (#3316)

2018-06-09 13:33:02 +01:00

flow-testing.rst

[ENT-1955] Documentation fixes (#3417)

2018-06-21 16:57:30 +01:00

gcp-vm.rst

Testnet documentation pages (#3287)

2018-07-11 14:12:52 +01:00

generating-a-node.rst

Document database configuration step when deploying nodes remotely, related to ENT-1678(#1224)

2018-07-09 16:14:18 +01:00

getting-set-up.rst

Merge remote-tracking branch 'remotes/open/master' into merges/july-10-15-51

2018-07-10 15:51:33 +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 commit '02348a584d56cdb562581d99be5b56348f7d1001' into chrisr3-os-merge

2018-06-23 00:06:11 +01: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-1955, ENT-2227 - Documentation scrub and TOC update (#1209)

2018-07-05 15:00:43 +01:00

index.rst

ENT-1955 - Fix TOC for HTML and PDF (#1244)

2018-07-10 13:30:08 +01:00

json.rst

Fixes docsite dead links.

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

key-concepts-consensus.rst

[CORDA-1612]: Fix truncated code snippets in docs PDF (#3347)

2018-06-13 09:43:16 +01:00

key-concepts-contracts.rst

Minor changes to text to more accurately reflect the current implementation. (#3477)

2018-07-02 10:26: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

[CORDA-1612]: Fix truncated code snippets in docs PDF (#3347)

2018-06-13 09:43:16 +01:00

key-concepts-identity.rst

Update key-concepts-identity.rst (#3480)

2018-06-29 16:31:48 +01:00

key-concepts-ledger.rst

[CORDA-1612]: Fix truncated code snippets in docs PDF (#3347)

2018-06-13 09:43:16 +01:00

key-concepts-node.rst

[CORDA-1612]: Fix truncated code snippets in docs PDF (#3347)

2018-06-13 09:43:16 +01:00

key-concepts-notaries.rst

Docs: moved notary setup guides from tutorials to operations. (#1162)

2018-07-03 10:07:50 +01:00

key-concepts-oracles.rst

[CORDA-1612]: Fix truncated code snippets in docs PDF (#3347)

2018-06-13 09:43:16 +01:00

key-concepts-states.rst

[CORDA-1612]: Fix truncated code snippets in docs PDF (#3347)

2018-06-13 09:43:16 +01:00

key-concepts-time-windows.rst

[CORDA-1612]: Fix truncated code snippets in docs PDF (#3347)

2018-06-13 09:43:16 +01:00

key-concepts-tradeoffs.rst

Minor changes to text to more accurately reflect the current implementation. (#3477)

2018-07-02 10:26:33 +01:00

key-concepts-transactions.rst

[CORDA-1612]: Fix truncated code snippets in docs PDF (#3347)

2018-06-13 09:43:16 +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

messaging.rst

Add documentation on clearing network map cache (#3280)

2018-05-31 17:44:38 +01:00

network-bootstrapper.rst

CORDA-1712 - Make documentation clearer for Network Bootstrapper (#3504)

2018-07-09 17:38:31 +01:00

network-map.rst

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

2018-07-09 16:45:20 +01:00

node-administration.rst

[ENT-1711] Update node monitoring docs. (#1218)

2018-07-10 14:28:02 +01:00

node-database-access-h2.rst

Revert "ENT-2179 merge OS -> enterprise (#1175)"

2018-07-02 17:06:20 +01:00

node-database.rst

Fix formatting in node database doc. (#1230)

2018-07-09 17:22:10 +01:00

node-explorer.rst

ENT-2160: Documentation updates for tools we ship with GA release. (#1131) (#1191)

2018-07-03 17:11:48 +01: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-operations-upgrade-cordapps.rst

ENT-2180 Document clarifications (#1124)

2018-07-03 14:39:57 +01:00

node-operations-upgrading.rst

ENT-2180 Document clarifications (#1124)

2018-07-03 14:39:57 +01:00

node-services.rst

Some cleanup after network map removal (#2006)

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

node-structure.rst

ENT-2174 documentation (#1145)

2018-07-02 15:24:12 +01:00

oracles.rst

Fix missing snippets (#1154)

2018-06-29 13:08:09 +01:00

permissioning.rst

Minor changes to text to more accurately reflect the current implementation. (#3477)

2018-07-02 10:26:33 +01:00

platform-support-matrix.rst

ENT-1955, ENT-2227 - Documentation scrub and TOC update (#1209)

2018-07-05 15:00:43 +01:00

quickstart-index.rst

ENT-2100 quick start page to include user journeys (#3523)

2018-07-09 17:40:18 +01:00

release-notes.rst

ENT-1955, ENT-2227 - Documentation scrub and TOC update (#1209)

2018-07-05 15:00:43 +01: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 'remotes/open/master' into merges/july-10-15-51

2018-07-10 15:51:33 +01:00

running-a-notary.rst

Docs: moved notary setup guides from tutorials to operations. (#1162)

2018-07-03 10:07:50 +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-index.rst

Fixing md formatting sphinixification issues (#3510)

2018-07-05 09:40:36 +01:00

serialization.rst

ENT-2171: Removing outdated information in the serialisation docs (#3475)

2018-06-29 10:50:48 +01:00

setting-up-a-corda-network.rst

Adds tables of content for network sections. (#3537)

2018-07-09 15:21:47 +01:00

shell.rst

Merge remote-tracking branch 'remotes/open/master' into merges/july-10-15-51

2018-07-10 15:51:33 +01:00

sizing-and-performance.rst

ENT-1951 Storage usage from performance tests (#1216)

2018-07-06 11:01:45 +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-2035 Use ./drives folder for JDBC jars instead of one specified by jarDirs configuration option (#1023)

2018-06-20 13:45:20 +01:00

tools-index.rst

CORDA-1602: Added cmd line flags to the network bootstrapper (#3419)

2018-06-23 11:36:10 +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

[ENT-1955] Documentation fixes (#3417)

2018-06-21 16:57:30 +01:00

tutorial-attachments.rst

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

2018-07-09 12:33:47 +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 commit '02348a584d56cdb562581d99be5b56348f7d1001' into chrisr3-os-merge

2018-06-23 00:06:11 +01:00

tutorial-contract.rst

[ENT-1955] Documentation fixes (#3417)

2018-06-21 16:57:30 +01:00

tutorial-cordapp.rst

Consolidates and extends debugging information. (#3548)

2018-07-10 15:17:59 +01:00

tutorial-custom-notary.rst

Fix missing snippets (#1154)

2018-06-29 13:08:09 +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

Fix missing snippets (#1154)

2018-06-29 13:08:09 +01:00

tutorial-tear-offs.rst

Fix missing snippets (#1154)

2018-06-29 13:08:09 +01:00

tutorial-test-dsl.rst

Update tutorial-test-dsl.rst (#3483)

2018-07-09 09:58:45 +01:00

tutorials-index.rst

Docs: moved notary setup guides from tutorials to operations. (#1162)

2018-07-03 10:07:50 +01:00

upgrade-notes.rst

Updates to master after GA release (#1167)

2018-07-03 10:25:13 +01:00

upgrading-cordapps.rst

[ENT-1994] Add documentation for operational node upgrades (#1036)

2018-06-25 17:35:11 +01:00

vault.rst

[ENT-1955] Documentation fixes (#3417)

2018-06-21 16:57:30 +01:00

version-compatibility.rst

ENT-1955, ENT-2227 - Documentation scrub and TOC update (#1209)

2018-07-05 15:00:43 +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