Anthony Keenan 168664f7a8 Merge remote-tracking branch 'open/master' into os-merge-20180722 ...

# Conflicts:
#	CONTRIBUTORS.md
#	constants.properties
#	docs/source/aws-vm-explore.rst
#	docs/source/azure-vm-explore.rst
#	docs/source/corda-networks-index.rst
#	docs/source/gcp-vm.rst
#	docs/source/getting-set-up.rst
#	docs/source/node-database.rst
#	finance/src/main/kotlin/net/corda/finance/contracts/asset/cash/selection/CashSelectionSQLServerImpl.kt
#	finance/src/main/resources/META-INF/services/net.corda.finance.contracts.asset.cash.selection.AbstractCashSelection
#	node/src/main/kotlin/net/corda/node/services/vault/NodeVaultService.kt
#	node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt

2018-07-22 23:06:43 +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

example-code

Enable new test to run in remote database mode - add SQL setup, add finance packages to create tables by Liquidate. (#1284)

2018-07-20 14:09:58 +01:00

resources

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

2018-07-22 23:06:43 +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-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

azure-template-guide.rst

Azure template guide (#1282)

2018-07-20 16:29:10 +01:00

blob-inspector.rst

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

2018-07-13 13:15:53 +01:00

building-a-cordapp-index.rst

Docs: clean up the toctree a little bit w.r.t. serialisation and tools

2018-07-12 18:42:19 +02: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-container-images.rst

Minor: doc fixes (#3584)

2018-07-13 09:58:05 +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

OS merge 2018-07-19

2018-07-19 16:43:46 +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

component-library-index.rst

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

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

conf.py

CORDA-1803 - Fix variable replacement (#3585)

2018-07-13 09:40:02 +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-flow-state-machines.rst

Add java samples

2018-07-12 15:30:23 +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/master' into os-merge-20180722

2018-07-22 23:06:43 +01:00

corda-nodes-index.rst

Remove some unlinked docs

2018-07-10 17:25:04 +01:00

corda-testnet-intro.rst

Azure template guide (#1282)

2018-07-20 16:29:10 +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

deploy-locally.rst

Na testnet explorer docs (#3660)

2018-07-20 16:21:24 +01:00

deploying-a-node.rst

ENT-2174 documentation (#1145)

2018-07-02 15:24:12 +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

Removed the negative reference to ethereum/bitcoin

2018-07-11 18:13:07 +02:00

flow-testing.rst

[ENT-1955] Documentation fixes (#3417)

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

gcp-vm.rst

Azure template guide (#1282)

2018-07-20 16:29:10 +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 'open/master' into os-merge-20180722

2018-07-22 23:06:43 +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

CORDA-1725 Add documentation on building Corda for Win/*nix and clean up doc bui… (#3578)

2018-07-13 22:12:20 +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

Remove deterministic modules from docsite

2018-07-10 17:31:18 +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: update notary setup page

2018-07-17 11:26:55 +02:00

key-concepts-oracles.rst

CORDA-1514 Add our patented nested Merkle trees protocol to documentation

2018-07-17 15:36:10 +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-tearoffs.rst

CORDA-1514 Add our patented nested Merkle trees protocol to documentation

2018-07-17 15:36:10 +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-1516 - Adding notary to key-concepts-transactions (#3502)

2018-07-17 11:53:53 +01:00

key-concepts.rst

CORDA-1514 Add our patented nested Merkle trees protocol to documentation

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

messaging.rst

ENT-2168: Node internal docs tweaks (#3624)

2018-07-16 17:13:43 +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

OS merge 2018-07-19

2018-07-19 16:43:46 +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

CORDA-1818 - fix markup in h2 docs (#3629)

2018-07-17 17:47:46 +01:00

node-database.rst

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

2018-07-22 23:06:43 +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

ENT-2168: Node internal docs tweaks (#3624)

2018-07-16 17:13:43 +01:00

node-structure.rst

Merge commit 'e879de7' into chrisr3-os-merge

2018-07-17 22:47:24 +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

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: update notary setup page

2018-07-17 11:26:55 +02: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

Docs: clean up the toctree a little bit w.r.t. serialisation and tools

2018-07-12 18:42:19 +02: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

testnet-explorer-corda.rst

Na testnet explorer docs (#3660)

2018-07-20 16:21:24 +01:00

testnet-explorer.rst

Azure template guide (#1282)

2018-07-20 16:29:10 +01:00

tools-index.rst

Docs: clean up the toctree a little bit w.r.t. serialisation and tools

2018-07-12 18:42:19 +02: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

Fixed out-of-date integration testing tutorial and added Java example (#3596)

2018-07-16 13:14:57 +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: update notary setup page

2018-07-17 11:26:55 +02:00

upgrade-notes.rst

Missing upgrade notes for table change in v3.1 - related to CORDA-1804 (#3567)

2018-07-16 11:43:24 +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-2168: Node internal docs tweaks (#3624)

2018-07-16 17:13:43 +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