tudor.malene@gmail.com eb801d40b8 Merge remote-tracking branch 'open/master' into tudor-merge-os-01_06 ...

# Conflicts:
#	core/src/main/kotlin/net/corda/core/cordapp/Cordapp.kt
#	core/src/main/kotlin/net/corda/core/internal/cordapp/CordappImpl.kt
#	node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
#	node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt
#	node/src/main/kotlin/net/corda/node/internal/cordapp/CordappLoader.kt

2018-06-01 13:56:43 +01:00

..

_static

ENT-1888: Docs: improve rendering of the database migration document. (#902)

2018-06-01 13:20:51 +02:00

_templates

…

design

ENT-1959: add a default value for mutualExclusionConfiguration.machineName (#877)

2018-05-25 11:13:53 +01:00

example-code

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

2018-05-25 14:19:15 +01:00

resources

Hot-cold operational guide fixes and improvements (#884)

2018-05-30 14:12:47 +01:00

whitepaper

Moves whitepapers. (#3217)

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

api-contract-constraints.rst

…

api-contracts.rst

…

api-core-types.rst

…

api-flows.rst

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

2018-05-25 14:19:15 +01:00

api-identity.rst

…

api-persistence.rst

ENT-1871 Rebrand R3Corda to Corda Enterprise (#838)

2018-05-31 08:59:05 +01:00

api-rpc.rst

…

api-scanner.rst

CORDA-1496 Add api-scanner documentation (#3184)

2018-05-24 15:43:58 +02:00

api-service-hub.rst

…

api-states.rst

…

api-testing.rst

[CORDA-1341]: Ensure API can be called concurrently wrt transactions. (#3235)

2018-05-29 15:25:34 +01:00

api-transactions.rst

…

api-vault-query.rst

…

aws-vm.rst

…

azure-vm.rst

update azure documentation (#2950)

2018-06-01 09:26:07 +01:00

blob-inspector.rst

CORDA-1238: Moved the blob inspector out of experimental and wired it to JackonSupport (#3224)

2018-05-24 18:26:55 +01:00

bridge-configuration-file.rst

ENT-1959: add a default value for mutualExclusionConfiguration.machineName (#877)

2018-05-25 11:13:53 +01:00

building-a-cordapp-index.rst

…

building-a-cordapp-samples.rst

…

building-against-master.rst

…

building-the-docs.rst

…

certificate-revocation.rst

…

changelog.rst

Merge remote-tracking branch 'open/master' into tudor-merge-os-01_06

2018-06-01 13:56:43 +01:00

cheat-sheet.rst

…

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

[CORDA-1264]: Mask internal errors if devMode is false. (#871)

2018-05-23 09:55:24 +01:00

codestyle.rst

…

component-library-index.rst

…

conf.py

ENT-1871 Rebrand R3Corda to Corda Enterprise (#838)

2018-05-31 08:59:05 +01:00

contract-catalogue.rst

…

contract-irs.rst

…

contract-upgrade.rst

…

contributing.rst

Add DCO requirement to contributing docs. (#3263)

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

corda-api.rst

CORDA-1496 Add api-scanner documentation (#3184)

2018-05-24 15:43:58 +02:00

corda-bridge-component.rst

…

corda-configuration-file.rst

Resolved merge conflicts.

2018-05-30 16:36:06 +01:00

corda-networks-index.rst

…

corda-nodes-index.rst

…

corda-repo-layout.rst

…

cordapp-build-systems.rst

…

cordapp-custom-serializers.rst

…

cordapp-overview.rst

…

crr-submission-tool.rst

…

database-migration.rst

ENT-1888: Docs: improve rendering of the database migration document. (#902)

2018-06-01 13:20:51 +02:00

demobench.rst

…

deploying-a-node.rst

…

event-scheduling.rst

…

financial-model.rst

…

flow-cookbook.rst

…

flow-library.rst

…

flow-state-machines.rst

Replace timestamp with time-window (#3211)

2018-05-24 16:06:33 +01:00

flow-testing.rst

…

generating-a-node.rst

…

getting-set-up.rst

Merge remote-tracking branch 'remotes/open/master' into merges/may-29-16-48

2018-05-29 17:17:08 +01:00

hello-world-flow.rst

…

hello-world-introduction.rst

…

hello-world-running.rst

…

hello-world-state.rst

…

hello-world-template.rst

…

hot-cold-deployment.rst

Hot-cold operational guide fixes and improvements (#884)

2018-05-30 14:12:47 +01:00

hsm-cert-generator.rst

…

hsm-crl-generator.rst

ENT-1883 Adding the CRL generator (#857)

2018-05-23 07:48:53 +01:00

index.rst

…

json.rst

…

key-concepts-consensus.rst

…

key-concepts-contracts.rst

Replace timestamp with time-window (#3211)

2018-05-24 16:06:33 +01:00

key-concepts-ecosystem.rst

…

key-concepts-flows.rst

…

key-concepts-identity.rst

…

key-concepts-ledger.rst

…

key-concepts-node.rst

…

key-concepts-notaries.rst

Docs: Add a section on what data is visible to notaries (#3159)

2018-05-23 08:59:58 +01:00

key-concepts-oracles.rst

Replace timestamp with time-window (#3211)

2018-05-24 16:06:33 +01:00

key-concepts-states.rst

…

key-concepts-time-windows.rst

…

key-concepts-tradeoffs.rst

…

key-concepts-transactions.rst

Replace timestamp with time-window (#3211)

2018-05-24 16:06:33 +01:00

key-concepts.rst

…

loadtesting.rst

…

messaging.rst

Add documentation on clearing network map cache (#3280)

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

network-map.rst

Merge remote-tracking branch 'remotes/open/master' into merges/may-31-19-04

2018-05-31 19:06:28 +01:00

network-simulator.rst

…

node-administration.rst

…

node-database.rst

Document ability to add custom dataSource properties - related to ENT-1428 (#870)

2018-05-30 14:54:55 +01:00

node-explorer.rst

…

node-internals-index.rst

…

node-services.rst

…

node-structure.rst

…

operations-guide.rst

Bogdan hotcold operational guide (#855)

2018-05-24 11:42:02 +01:00

oracles.rst

…

out-of-process-verification.rst

…

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

quickstart-index.rst

…

release-notes.rst

ENT-1871 Rebrand R3Corda to Corda Enterprise (#838)

2018-05-31 08:59:05 +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

…

running-a-notary.rst

…

running-crr-submission-tool.rst

…

running-dev-keystore-generator.rst

…

running-doorman.rst

Fixing docs indentation for CRL (#864)

2018-05-21 17:05:14 +01:00

running-hsm-cert-generator.rst

ENT-1883 Adding the CRL generator (#857)

2018-05-23 07:48:53 +01:00

running-hsm-crl-generator.rst

ENT-1883 Adding the CRL generator (#857)

2018-05-23 07:48:53 +01:00

running-signing-service.rst

…

secure-coding-guidelines.rst

…

serialization-default-evolution.rst

ENT-1933: make NetworkParameters serialization compatible (#3234)

2018-05-25 17:14:00 +01:00

serialization-enum-evolution.rst

…

serialization.rst

…

setting-up-a-corda-network.rst

Document notary.serviceLegalName (#3265)

2018-05-30 15:47:40 +01:00

shell.rst

Resloved merge conflicts.

2018-05-29 11:32:43 +01:00

signing-service.rst

…

soft-locking.rst

…

testing.rst

…

tools-index.rst

CORDA-1238: Moved the blob inspector out of experimental and wired it to JackonSupport (#3224)

2018-05-24 18:26:55 +01:00

troubleshooting.rst

…

tut-two-party-contract.rst

…

tut-two-party-flow.rst

…

tut-two-party-introduction.rst

…

tutorial-attachments.rst

Update tutorial-attachments.rst

2018-05-23 13:44:28 +01:00

tutorial-building-transactions.rst

Replace timestamp with time-window (#3211)

2018-05-24 16:06:33 +01:00

tutorial-clientrpc-api.rst

…

tutorial-contract.rst

Replace timestamp with time-window (#3211)

2018-05-24 16:06:33 +01:00

tutorial-cordapp.rst

…

tutorial-custom-notary.rst

…

tutorial-integration-testing.rst

…

tutorial-observer-nodes.rst

…

tutorial-tear-offs.rst

…

tutorial-test-dsl.rst

…

tutorials-index.rst

…

upgrade-notes.rst

ENT-1871 Rebrand R3Corda to Corda Enterprise (#838)

2018-05-31 08:59:05 +01:00

upgrading-cordapps.rst

…

vault.rst

…

versioning.rst

…

writing-a-cordapp.rst

…