Anthony Keenan 08f32a9329 Merge remote-tracking branch 'open/master' into anthony-os-merge-2018-10-24 ...

# Conflicts:
#	build.gradle
#	core/src/main/kotlin/net/corda/core/internal/JarSignatureCollector.kt
#	core/src/main/kotlin/net/corda/core/transactions/TransactionBuilder.kt
#	docs/source/cli-ux-guidelines.rst
#	docs/source/testnet-explorer-corda.rst
#	finance/src/integration-test/kotlin/net/corda/finance/flows/test/CashConfigDataFlowTest.kt
#	finance/src/main/kotlin/net/corda/finance/flows/CashConfigDataFlow.kt
#	node/src/integration-test/kotlin/net/corda/node/services/statemachine/FlowVersioningTest.kt
#	node/src/main/kotlin/net/corda/node/Corda.kt
#	node/src/main/kotlin/net/corda/node/internal/Node.kt
#	node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt
#	node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
#	node/src/test/kotlin/net/corda/node/internal/NodeTest.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/DriverDSLImpl.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/NodeBasedTest.kt
#	tools/explorer/src/main/kotlin/net/corda/explorer/ExplorerSimulation.kt

2018-10-25 11:30:52 +01:00

..

_static

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

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

_templates

ENT-2473: Removed copyright headers (#1364)

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

design

Merge remote-tracking branch 'open/master' into anthony-os-merge-2018-10-24

2018-10-25 11:30:52 +01:00

example-code

Merge OS -> ENT

2018-10-21 21:57:37 +01:00

resources

Merge branch 'open/master-ba7727a4e1' into andrius/merge-10-22

2018-10-22 15:38:28 +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

Merge remote-tracking branch 'private/master' into tudor_os_merge_23_10

2018-10-23 10:29:43 +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-20180924-2

2018-09-24 15:35:08 +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

Database setup documentation improvements based on questions in ENT-2421. (#1425)

2018-10-01 13:06:21 +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

FungibleState and design document for tokens (#4049)

2018-10-20 10:52:24 +01:00

api-testing.rst

Various clean ups of the docs example code (#3982)

2018-09-24 15:00:31 +01:00

api-transactions.rst

Added more docs for reference states to key concepts and api docs. (#4013)

2018-10-02 16:29:19 +01:00

api-vault-query.rst

CORDA-1997 Added constraint type information to vault states table. (#3975)

2018-10-03 13:41:25 +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 'open/master' into anthony-os-merge-2018-10-24

2018-10-25 11:30:52 +01:00

building-a-cordapp-index.rst

Updates docs structure. (#4072)

2018-10-15 11:40:10 +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

CORDA-1585 - Tidy up participate docs + pdf toctree backport (#3674)

2018-07-24 10:05:57 +01:00

certificate-revocation.rst

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

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

changelog-enterprise.rst

Separate out Release Notes and Changelog entries between ENT and OS (to avoid merge conflicts and provide clearer separation of content) (#1490)

2018-10-19 16:44:57 +01:00

changelog.rst

Merge remote-tracking branch 'open/master' into anthony-os-merge-2018-10-24

2018-10-25 11:30:52 +01:00

cheat-sheet.rst

Minor corrections to the V2 cheatsheet.

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

cipher-suites.rst

CORDA-1969 Retire SECP256K1 for TLS (#3920)

2018-09-11 13:04:29 +01:00

cli-application-shell-extensions.rst

CORDA-1838: Add subcommands to node (#4091)

2018-10-24 13:58:19 +01:00

clientrpc.rst

Various clean ups of the docs example code (#3982)

2018-09-24 15:00:31 +01:00

compatibility-zones.rst

Address review comments

2018-10-18 15:13:55 +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-1585 - Tidy up participate docs + pdf toctree backport (#3674)

2018-07-24 10:05:57 +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

Various clean ups of the docs example code (#3982)

2018-09-24 15:00:31 +01:00

corda-api.rst

Minor: fix old warning in Corda 1.0 docs, don't recommend use of Jigsaw yet.

2018-09-05 13:22:56 +02:00

corda-configuration-file.rst

Merge remote-tracking branch 'open/master' into anthony-os-merge-2018-10-24

2018-10-25 11:30:52 +01:00

corda-firewall-component.rst

make sure the doc saids TLS 1.2 whenever we mention it with AMQP1.0, to avoid confusion. (#1455)

2018-10-08 09:48:05 +01:00

corda-firewall.rst

Bridge to Firewall renames

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

corda-networks-index.rst

Merge OS -> ENT

2018-10-21 21:57:37 +01:00

corda-nodes-index.rst

Remove some unlinked docs

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

corda-testnet-intro.rst

Merge OS -> ENT

2018-10-21 21:57:37 +01:00

cordapp-build-systems.rst

Merge commit '47068e6b7ad0afb3ed8df61a429470f19331b7b5' into chrisr3-os-merf

2018-10-16 12:07:55 +01: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

Better docs of CorDapp structure and node interaction (#3761)

2018-08-17 16:52:56 +01:00

database-management.rst

Makes it clear where to put the migration JAR. Bullet point fixes (#1353)

2018-08-22 17:18:08 +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

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

2018-09-03 20:13:38 +02:00

deterministic-modules.rst

Remove deterministic modules from docsite

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

ENT-2610: Separate passwords for store and for private keys (#1483)

2018-10-23 16:05:08 +01:00

flow-cookbook.rst

Various clean ups of the docs example code (#3982)

2018-09-24 15:00:31 +01:00

flow-overriding.rst

ENT-2509 - Make @InitiatedBy flows overridable via node config (#3960)

2018-10-23 16:45:07 +01:00

flow-state-machines.rst

Various clean ups of the docs example code (#3982)

2018-09-24 15:00:31 +01:00

flow-testing.rst

[ENT-1955] Documentation fixes (#3417)

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

generating-a-node.rst

Merge commit 'adcd0d45dfd5433a70a551c49b5c828f13667606' into christians/os-merge-adcd0d4

2018-09-27 15:03:25 +01:00

getting-set-up.rst

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

2018-10-15 12:34:29 +01:00

hello-world-flow.rst

Assorted set of clean ups (#4039)

2018-10-05 18:05:10 +01: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 'remotes/open/master' into parkri-os-merge-20180814-1

2018-08-14 11:26:52 +01:00

hello-world-state.rst

Various clean ups of the docs example code (#3982)

2018-09-24 15:00:31 +01:00

hello-world-template.rst

Miscellaneous doc fixes (#3760)

2018-08-10 12:28:59 +01:00

hot-cold-deployment.rst

ENT-2294: CE HA deployment documentation refers to persistent mount commands but none are shown

2018-07-27 15:38:40 +01:00

index.rst

Merge commit '47068e6b7ad0afb3ed8df61a429470f19331b7b5' into chrisr3-os-merf

2018-10-16 12:07:55 +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-djvm.rst

Deterministic JVM (#3386)

2018-08-22 16:01:39 +01:00

key-concepts-ecosystem.rst

Removes Identity page. Reworks it into the Network page. (#3687)

2018-07-25 13:13:10 +01: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-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

Added more docs for reference states to key concepts and api docs. (#4013)

2018-10-02 16:29:19 +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

Added more docs for reference states to key concepts and api docs. (#4013)

2018-10-02 16:29:19 +01:00

key-concepts.rst

Deterministic JVM (#3386)

2018-08-22 16:01:39 +01:00

messaging.rst

make sure the doc saids TLS 1.2 whenever we mention it with AMQP1.0, to avoid confusion. (#1455)

2018-10-08 09:48:05 +01:00

network-bootstrapper.rst

CORDA-1838: Add subcommands to node (#4091)

2018-10-24 13:58:19 +01:00

network-builder.rst

Reflects network builder docs on Master. (#3709)

2018-07-27 16:50:53 +01:00

network-map.rst

Merge remote-tracking branch 'open/master' into anthony-os-merge-2018-10-24

2018-10-25 11:30:52 +01:00

node-administration.rst

Merge Open source up to commit '92d2e4ae38a2af27748245221d0470cdb0ddac0c'

2018-10-02 11:30:11 +01:00

node-database-access-h2.rst

Joel upgrade docs (#3730)

2018-08-03 13:34:34 +01:00

node-database.rst

Documents default node tables. (#4077)

2018-10-16 10:51:57 +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 'adcd0d45dfd5433a70a551c49b5c828f13667606' into christians/os-merge-adcd0d4

2018-09-27 15:03:25 +01:00

notary-healthcheck.rst

ENT-1993: Documentation for notary health check (#1287)

2018-07-24 14:41:53 +01:00

oracles.rst

Fix missing snippets (#1154)

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

permissioning.rst

Documents default and configurable keystore passwords. Clean-up. (#3988)

2018-09-27 09:16:17 +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

Updates docs structure. (#4072)

2018-10-15 11:40:10 +02:00

release-notes-enterprise.rst

Separate out Release Notes and Changelog entries between ENT and OS (to avoid merge conflicts and provide clearer separation of content) (#1490)

2018-10-19 16:44:57 +01:00

release-notes.rst

Separate out Release Notes and Changelog entries between ENT and OS (to avoid merge conflicts and provide clearer separation of content) (#1490)

2018-10-19 16:44:57 +01:00

running-a-node.rst

Merge remote-tracking branch 'open/master' into anthony-os-merge-2018-10-24

2018-10-25 11:30:52 +01:00

running-a-notary.rst

Merge OS -> ENT

2018-10-21 21:57:37 +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

Removes unnecessary caption. (#3994)

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

serialization.rst

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

2018-10-09 16:15:59 +01:00

shell.rst

Merge remote-tracking branch 'open/master' into anthony-os-merge-2018-10-24

2018-10-25 11:30:52 +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.rst

Azure template guide (#1282)

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

tools-index.rst

Merge branch 'os-merge-point' into os-merge-93bb24e

2018-07-31 14:52:53 +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

Various clean ups of the docs example code (#3982)

2018-09-24 15:00:31 +01:00

tut-two-party-flow.rst

Various clean ups of the docs example code (#3982)

2018-09-24 15:00:31 +01:00

tut-two-party-introduction.rst

[ENT-1955] Documentation fixes (#3417)

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

tutorial-attachments.rst

Code cleanup, mostly shortening long lines (#4070)

2018-10-15 12:01:15 +01:00

tutorial-building-transactions.rst

Various clean ups of the docs example code (#3982)

2018-09-24 15:00:31 +01:00

tutorial-clientrpc-api.rst

Merge remote-tracking branch 'remotes/open/master' into parkri-os-merge-20180924-2

2018-09-24 15:35:08 +01:00

tutorial-contract.rst

Various clean ups of the docs example code (#3982)

2018-09-24 15:00:31 +01:00

tutorial-cordapp.rst

Updates docs structure. (#4072)

2018-10-15 11:40:10 +02:00

tutorial-custom-notary.rst

Merge branch 'open/master' into andrius/merge-10-15

2018-10-15 10:50:12 +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

Merge remote-tracking branch 'remotes/open/master' into parkri-os-merge-20180924-2

2018-09-24 15:35:08 +01:00

tutorial-test-dsl.rst

Various clean ups of the docs example code (#3982)

2018-09-24 15:00:31 +01:00

tutorials-index.rst

Docs: update notary setup page

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

upgrade-notes.rst

RELEASE - Merge 3.3 upgrade / notes / changelog backto master (#4085)

2018-10-17 15:09:48 +01:00

upgrading-cordapps.rst

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

2018-08-14 11:26:52 +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

[CORDA-1926] Implement target version and min platform version (#3899)

2018-09-28 09:46:06 +01:00

writing-a-cordapp.rst

Updates docs structure. (#4072)

2018-10-15 11:40:10 +02:00