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

..

bridge

Bridge to Firewall renames

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

explorer

Bank of Corda integration with Trader Demo and Explorer

2016-12-22 15:55:50 +00:00

performance

ENT-1860 Enterprise sizing guidelines (#1193)

2018-07-04 17:43:21 +01:00

allOfChart.png

Change clauses diagrams after clauses clean-up.

2017-01-17 11:34:21 +00:00

anyOfChart.png

Change clauses diagrams after clauses clean-up.

2017-01-17 11:34:21 +00:00

aws_select_ubuntu.png

Testnet documentation pages (#3287)

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

aws-connect.png

Testnet documentation pages (#3287)

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

aws-elastic-actions.png

Testnet documentation pages (#3287)

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

aws-elastic.png

Testnet documentation pages (#3287)

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

aws-firewall.png

Testnet documentation pages (#3287)

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

aws-instance-type.png

Testnet documentation pages (#3287)

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

aws-instances-connect.png

Testnet documentation pages (#3287)

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

aws-instances.png

Testnet documentation pages (#3287)

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

aws-keys.png

Testnet documentation pages (#3287)

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

aws-launch.png

Testnet documentation pages (#3287)

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

aws-storage.png

Testnet documentation pages (#3287)

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

azure_ip.png

Updated Azure documentation to better describe new Azure multi node offering (#709)

2017-05-19 17:15:54 +01:00

azure_multi_node_step1.png

Updated Azure documentation to better describe new Azure multi node offering (#709)

2017-05-19 17:15:54 +01:00

azure_multi_node_step2.png

Updated Azure documentation to better describe new Azure multi node offering (#709)

2017-05-19 17:15:54 +01:00

azure_multi_node_step3.png

Updated Azure documentation to better describe new Azure multi node offering (#709)

2017-05-19 17:15:54 +01:00

azure_multi_node_step4.png

Updated Azure documentation to better describe new Azure multi node offering (#709)

2017-05-19 17:15:54 +01:00

azure_syslog.png

Updated Azure documentation to better describe new Azure multi node offering (#709)

2017-05-19 17:15:54 +01:00

azure_vm_10_00_1.png

Added first draft documentation on the Azure VM (#67)

2016-12-21 09:57:37 +00:00

azure_vm_10_00.png

Added first draft documentation on the Azure VM (#67)

2016-12-21 09:57:37 +00:00

azure_vm_10_05_1.png

Added first draft documentation on the Azure VM (#67)

2016-12-21 09:57:37 +00:00

azure_vm_10_05.png

Added first draft documentation on the Azure VM (#67)

2016-12-21 09:57:37 +00:00

azure_vm_10_16_1.png

Added first draft documentation on the Azure VM (#67)

2016-12-21 09:57:37 +00:00

azure_vm_10_16.png

Added first draft documentation on the Azure VM (#67)

2016-12-21 09:57:37 +00:00

azure_vm_10_19.png

Added first draft documentation on the Azure VM (#67)

2016-12-21 09:57:37 +00:00

azure_vm_10_20.png

Added first draft documentation on the Azure VM (#67)

2016-12-21 09:57:37 +00:00

azure_vm_10_22.png

Added first draft documentation on the Azure VM (#67)

2016-12-21 09:57:37 +00:00

azure_vm_10_26.png

Added first draft documentation on the Azure VM (#67)

2016-12-21 09:57:37 +00:00

azure_vm_10_36.png

Added first draft documentation on the Azure VM (#67)

2016-12-21 09:57:37 +00:00

azure_vm_10_47.png

Added first draft documentation on the Azure VM (#67)

2016-12-21 09:57:37 +00:00

azure_vm_10_49.png

Added first draft documentation on the Azure VM (#67)

2016-12-21 09:57:37 +00:00

azure_vm_10_51.png

Added first draft documentation on the Azure VM (#67)

2016-12-21 09:57:37 +00:00

azure_vm_10_52.png

Added first draft documentation on the Azure VM (#67)

2016-12-21 09:57:37 +00:00

azure_vm_10_53.png

Added first draft documentation on the Azure VM (#67)

2016-12-21 09:57:37 +00:00

azure_vm_10_54.png

Added first draft documentation on the Azure VM (#67)

2016-12-21 09:57:37 +00:00

azure_yos.png

Updated Azure documentation to better describe new Azure multi node offering (#709)

2017-05-19 17:15:54 +01:00

azure-connect-ssh.png

Testnet documentation pages (#3287)

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

azure-connect.png

Testnet documentation pages (#3287)

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

azure-create-vm.png

Testnet documentation pages (#3287)

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

azure-instance-type.png

Testnet documentation pages (#3287)

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

azure-networking.png

Testnet documentation pages (#3287)

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

azure-nsg-2.png

Testnet documentation pages (#3287)

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

azure-nsg.png

Testnet documentation pages (#3287)

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

azure-port-rule.png

Testnet documentation pages (#3287)

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

azure-rg-2.png

Testnet documentation pages (#3287)

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

azure-rg.png

Testnet documentation pages (#3287)

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

azure-screen-form.png

Testnet documentation pages (#3287)

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

azure-select-ubuntu.png

Testnet documentation pages (#3287)

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

azure-set-static-ip.png

Testnet documentation pages (#3287)

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

azure-settings-ok.png

Testnet documentation pages (#3287)

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

azure-shell.png

Testnet documentation pages (#3287)

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

azure-ssh.png

Testnet documentation pages (#3287)

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

azure-vm-form.png

Testnet documentation pages (#3287)

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

azure-vm-settings.png

Testnet documentation pages (#3287)

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

azure-vm-spec.png

Testnet documentation pages (#3287)

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

basic-tx.png

Docsite reorg ahead of beta launch.

2017-06-05 13:37:23 +01:00

certificate_structure.png

Update identity docs (#2319)

2018-02-28 18:04:08 +00:00

cheatsheet.jpg

Minor corrections to the V2 cheatsheet.

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

commands.png

Docsite reorg ahead of beta launch.

2017-06-05 13:37:23 +01:00

committed_tx.png

Docsite reorg ahead of beta launch.

2017-06-05 13:37:23 +01:00

commPaperClauses.png

Change clauses diagrams after clauses clean-up.

2017-01-17 11:34:21 +00:00

commPaperExecution.png

Change clauses diagrams after clauses clean-up.

2017-01-17 11:34:21 +00:00

composite-key-2.png

Rename PublicKeyTree -> CompositeKey and unify terminology across documentation.

2016-11-21 14:47:19 +00:00

composite-key.png

Rename PublicKeyTree -> CompositeKey and unify terminology across documentation.

2016-11-21 14:47:19 +00:00

console2.png

Testnet documentation pages (#3287)

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

consolegcp.png

Testnet documentation pages (#3287)

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

consolegcpcreatevm.png

Testnet documentation pages (#3287)

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

contract-cp-state.png

Further docsite changes, including reorganising the index.

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

contract-cp.png

Further docsite changes, including reorganising the index.

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

contract-irs.png

Further docsite changes, including reorganising the index.

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

contract.png

Key Concepts rewrite for open source day (#7)

2017-01-26 15:46:40 +00:00

corda_banner.png

Updated Azure documentation to better describe new Azure multi node offering (#709)

2017-05-19 17:15:54 +01:00

financialContractStateModel.png

Key Concepts rewrite for open source day (#7)

2017-01-26 15:46:40 +00:00

firstOfChart.png

Change clauses diagrams after clauses clean-up.

2017-01-17 11:34:21 +00:00

flow-interface.png

Updates the documentation on versioning.

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

flow-overview.png

Docsite reorg ahead of beta launch.

2017-06-05 13:37:23 +01:00

flow-sequence.png

Further docsite changes, including reorganising the index.

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

flow.gif

Docsite reorg ahead of beta launch.

2017-06-05 13:37:23 +01:00

flow.png

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

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

flowWatchCmd.png

M12 release notes. (#806)

2017-06-08 15:29:48 +01:00

full-tx.png

Replace timestamp with time-window (#3211)

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

gcpcompute.png

Testnet documentation pages (#3287)

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

gcpconsolelaunchssh.png

Testnet documentation pages (#3287)

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

gcpconsolevmsettings.png

Testnet documentation pages (#3287)

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

gcpshell.png

Testnet documentation pages (#3287)

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

groupClauseVerifyChart.png

Add clauses documentation.

2016-11-29 11:53:54 +00:00

grouped-tx.png

Docsite reorg ahead of beta launch.

2017-06-05 13:37:23 +01:00

hawtio-jmx.png

CORDA-822 - JMX Jolokia instrumentation (#2197)

2017-12-08 16:27:12 +00:00

hot-cold.png

Bogdan hotcold operational guide (#855)

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

hsm_csr_signing_flow.pdf

Adding HSM signing service docs (#122)

2017-11-24 11:32:12 +00:00

in-out-groups.png

Docsite reorg ahead of beta launch.

2017-06-05 13:37:23 +01:00

irs.graffle

First IRS documentation

2016-04-12 11:26:22 +01:00

irs.txt

First IRS documentation

2016-04-12 11:26:22 +01:00

ledger-table.png

Docsite reorg ahead of beta launch.

2017-06-05 13:37:23 +01:00

ledger-venn.png

Docsite reorg ahead of beta launch.

2017-06-05 13:37:23 +01:00

merkleTree.png

Tearoff fixes (#78)

2017-02-03 14:02:51 +00:00

network-simulator.png

Further docsite changes, including reorganising the index.

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

network.png

Docsite reorg ahead of beta launch.

2017-06-05 13:37:23 +01:00

newprojectgcp.png

Testnet documentation pages (#3287)

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

node-architecture.png

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

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

node-diagram.png

Docsite reorg ahead of beta launch.

2017-06-05 13:37:23 +01:00

partialMerkle.png

Tearoff fixes (#78)

2017-02-03 14:02:51 +00:00

run-config-drop-down.png

Changed SDK tutorial based on latest repo changes and some feedback.

2016-11-28 15:42:48 +00:00

running_node.png

Hello, World! CorDapp tutorial

2017-06-16 14:05:52 +01:00

signatureMetadata.png

Merge release-v1 onto master (mostly documentation changes) (#1797)

2017-10-03 17:32:11 +01:00

simple-tutorial-flow.png

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

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

simple-tutorial-transaction-2.png

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

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

simple-tutorial-transaction.png

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

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

state-hierarchy.png

Docsite reorg ahead of beta launch.

2017-06-05 13:37:23 +01:00

state-sequence.png

Docsite reorg ahead of beta launch.

2017-06-05 13:37:23 +01:00

state.png

Docsite reorg ahead of beta launch.

2017-06-05 13:37:23 +01:00

subTreesPrivacy.png

Merge release-v1 onto master (mostly documentation changes) (#1797)

2017-10-03 17:32:11 +01:00

testnet-account-type.png

Testnet documentation pages (#3287)

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

testnet-form.png

Testnet documentation pages (#3287)

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

testnet-landing.png

Testnet documentation pages (#3287)

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

testnet-platform-clean.png

Testnet documentation pages (#3287)

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

testnet-platform.png

Testnet documentation pages (#3287)

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

testnet-signin-auth.png

Testnet documentation pages (#3287)

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

testnet-signin.png

Testnet documentation pages (#3287)

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

testnet-terms.png

Testnet documentation pages (#3287)

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

time-window.gif

Docsite reorg ahead of beta launch.

2017-06-05 13:37:23 +01:00

time-window.png

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

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

transaction-flow.png

Updates tx API page and makes corresponding cookbook changes. (#1624)

2017-09-25 16:01:53 +01:00

tutorial-state.png

Updates hello world tutorials for v1.0.

2017-10-02 09:08:59 +01:00

tutorial-transaction.png

Hello, World! CorDapp tutorial

2017-06-16 14:05:52 +01:00

tx_with_sigs.png

Docsite reorg ahead of beta launch.

2017-06-05 13:37:23 +01:00

tx-chain.png

Docsite reorg ahead of beta launch.

2017-06-05 13:37:23 +01:00

tx-validation.png

Docsite reorg ahead of beta launch.

2017-06-05 13:37:23 +01:00

uncommitted_tx.png

Docsite reorg ahead of beta launch.

2017-06-05 13:37:23 +01:00

ungrouped-tx.png

Docsite reorg ahead of beta launch.

2017-06-05 13:37:23 +01:00

uniqueness-consensus.png

Docsite reorg ahead of beta launch.

2017-06-05 13:37:23 +01:00

unlinked-gradle.png

Changes from a doc review that were omitted in first PR, also changes from corda=samples repo

2016-11-18 17:58:52 +00:00

validation-consensus.png

Updates diagram to correctly show chain-walking process.

2018-04-25 12:54:57 +01:00

vault-simple.png

Docsite reorg ahead of beta launch.

2017-06-05 13:37:23 +01:00

vault.png

Key Concepts rewrite for open source day (#7)

2017-01-26 15:46:40 +00:00

yo_flow_progress.png

Updated Azure documentation to better describe new Azure multi node offering (#709)

2017-05-19 17:15:54 +01:00

yo_peers2.png

Updated Azure documentation to better describe new Azure multi node offering (#709)

2017-05-19 17:15:54 +01:00

Yo_peers.png

Updated Azure documentation to better describe new Azure multi node offering (#709)

2017-05-19 17:15:54 +01:00

Yo_web_ui.png

Updated Azure documentation to better describe new Azure multi node offering (#709)

2017-05-19 17:15:54 +01:00