Shams Asari 445ffc8404 Merge remote-tracking branch 'open/master' into os-merge-90a7dd2 ...

# Conflicts:
#	core/src/main/kotlin/net/corda/core/crypto/internal/ProviderMap.kt
#	core/src/main/kotlin/net/corda/core/messaging/CordaRPCOps.kt
#	core/src/main/kotlin/net/corda/core/utilities/ByteArrays.kt
#	finance/src/main/resources/migration/cash.changelog-master.xml
#	finance/src/main/resources/migration/commercial-paper.changelog-master.xml
#	finance/src/test/kotlin/net/corda/finance/flows/CashIssueFlowTests.kt
#	node/src/integration-test/kotlin/net/corda/node/flows/FlowRetryTest.kt
#	node/src/integration-test/kotlin/net/corda/node/modes/draining/P2PFlowsDrainingModeTest.kt
#	node/src/integration-test/kotlin/net/corda/node/services/statemachine/HardRestartTest.kt
#	node/src/integration-test/kotlin/net/corda/services/messaging/P2PMessagingTest.kt
#	node/src/main/kotlin/net/corda/node/Corda.kt
#	node/src/main/kotlin/net/corda/node/services/keys/PersistentKeyManagementService.kt
#	node/src/main/kotlin/net/corda/node/services/persistence/DBCheckpointStorage.kt

2018-09-12 11:37:11 +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-20180906

2018-09-06 11:20:45 +01:00

example-code

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

2018-09-12 11:37:11 +01:00

resources

Merge remote-tracking branch 'open/master'

2018-08-23 13:55:11 +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

Documents waitQuiescent. Explains why it is important. (#3787)

2018-08-16 17:34:50 +01:00

api-transactions.rst

CORDA-1332 Reference input states (#3525)

2018-07-25 14:06:56 +01:00

api-vault-query.rst

Support for case insensitive vault queries (#3853)

2018-09-07 10:20:21 +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 kat-merge-27072018

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

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.rst

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

2018-09-12 09:54:58 +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

clientrpc.rst

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

2018-09-03 20:13:38 +02: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

Add java samples

2018-07-12 15:30:23 +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-20180906

2018-09-06 11:20:45 +01:00

corda-firewall-component.rst

using TLS 1.2

2018-07-20 16:09:57 -04:00

corda-firewall.rst

Bridge to Firewall renames

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

corda-networks-index.rst

Remove files not wanted in ent documentation

2018-07-23 09: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

Merge commit 'ff62df8d5a0ab9eabfe919b65a8c73baa3dca7f3' into chrisr3-os-merge

2018-08-20 15:46:20 +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

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

consistent cert organization

2018-07-24 16:08:39 -04: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

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-20180724

2018-07-24 11:33:21 +01:00

hello-world-flow.rst

Miscellaneous doc fixes (#3760)

2018-08-10 12:28:59 +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

CORDA-1201 Remove duplicated doc section. (#2924)

2018-04-11 11:08:20 +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

Add a design doc for signature constraints.

2018-08-17 16:09:46 +02: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

[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

Deterministic JVM (#3386)

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

messaging.rst

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

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

network-bootstrapper.rst

Fixes formatting. Fixes link. (#3693)

2018-07-26 10:09:35 +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 'remotes/open/master' into parkri-os-merge-20180809-1

2018-08-09 09:33:38 +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

Joel upgrade docs (#3730)

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

node-database.rst

ENT-2243 Recommend table and db permissions and how best to set up a secure node in ent docsite

2018-08-15 10:37:20 +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

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

CORDA-1938 Adding version info to the node info submission request (#3854)

2018-08-31 09:34:42 +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

RELEASE - Update upgrade and release notes on master post V3.2 (#3683)

2018-07-25 18:04:02 +01:00

running-a-node.rst

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

2018-09-06 11:20:45 +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 commit 'ff62df8d5a0ab9eabfe919b65a8c73baa3dca7f3' into chrisr3-os-merge

2018-08-20 15:46:20 +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

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 'ff62df8d5a0ab9eabfe919b65a8c73baa3dca7f3' into chrisr3-os-merge

2018-08-20 15:46:20 +01:00

tutorial-contract.rst

[ENT-1955] Documentation fixes (#3417)

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

tutorial-cordapp.rst

[CORDA-1841]: Made paths in tutorial-cordapp consistent. (#3778)

2018-08-13 16:21:16 +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

Fixes formatting. (#1326)

2018-08-10 11:27:35 +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

Updates versioning docs.

2018-01-16 15:29:26 +00:00

writing-a-cordapp.rst

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

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