Shams Asari 65ff931f53 Merge branch 'master' into shams-master-merge-081217 ...

# Conflicts:
#	node-api/src/main/kotlin/net/corda/nodeapi/internal/crypto/KeyStoreWrapper.kt
#	node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
#	node/src/main/kotlin/net/corda/node/services/config/ConfigUtilities.kt
#	node/src/test/kotlin/net/corda/node/services/identity/InMemoryIdentityServiceTests.kt
#	node/src/test/kotlin/net/corda/node/services/identity/PersistentIdentityServiceTests.kt
#	samples/irs-demo/src/integration-test/kotlin/net/corda/test/spring/SpringDriver.kt
#	testing/node-driver/src/integration-test/kotlin/net/corda/testing/driver/DriverTests.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/driver/Driver.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/driver/DriverDSL.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/internal/DriverDSLImpl.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/internal/NodeBasedTest.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/internal/RPCDriver.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/internal/demorun/DemoRunner.kt
#	testing/test-utils/src/main/kotlin/net/corda/testing/CoreTestUtils.kt
#	verifier/src/integration-test/kotlin/net/corda/verifier/VerifierDriver.kt

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

..

_static

Removes the maxWidth parameter that caused the docsite to not use the full screen width.

2017-12-05 14:23:41 +00:00

_templates

Replaces links to Discourse with Stack Overflow links.

2017-10-30 10:09:08 +00:00

example-code

Merge branch 'master' into shams-merge-master-041217

2017-12-04 13:39:32 +00:00

resources

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

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

whitepaper

added correct 'figure' translation for traditional chinese.

2017-05-08 14:36:29 +02:00

api-contracts.rst

Joel api contracts (#1611)

2017-09-22 16:51:14 +01:00

api-core-types.rst

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

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

api-flows.rst

Fixes the API docs.

2017-10-07 12:48:16 +01:00

api-identity.rst

Reflects V1.0 changes on Master re: internal samples and identity sync flow API.

2017-10-25 09:29:32 +01:00

api-persistence.rst

Update customSchemas documentation. (#1902)

2017-10-19 09:26:40 +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-transactions.rst

Fixes the API docs.

2017-10-07 12:48:16 +01:00

api-vault-query.rst

Adds an example use of pagination.

2017-12-05 10:25:48 +00:00

azure-vm.rst

[CORDA-446] Clean up other mentions of network map node and logic (#1974)

2017-11-01 14:25:48 +00:00

building-a-cordapp-index.rst

Re-introduce demo docs (#1981)

2017-11-22 15:39:48 +00:00

building-a-cordapp-samples.rst

Re-introduce demo docs (#1981)

2017-11-22 15:39:48 +00:00

building-against-master.rst

Updates the example CorDapp page.

2017-07-21 12:33:31 +01:00

building-the-docs.rst

Removed old information about Dokka from the building docs documentation.

2017-03-30 12:23:20 +01:00

changelog.rst

Corda now works with H2 without the need to allow Hibernate to create the database automatically. (#2124)

2017-11-28 17:33:02 +00:00

cheat-sheet.rst

Adds the cheat sheet to the docsite. (#556)

2017-05-03 12:59:40 +01:00

CLI-vs-IDE.rst

Final documentation tweaks for M11 (#632)

2017-05-05 08:30:58 +01:00

clientrpc.rst

[CORDA-758]: Permissions are now checked for each RPC method. (#1985)

2017-11-02 15:09:49 +00:00

codestyle.rst

Regen docsite with new JavaDoc format API reference

2017-01-18 13:42:22 +01:00

component-library-index.rst

Further docsite changes, including reorganising the index.

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

conf.py

Uses dynamic loading of dropdown versions. Styles box slightly.

2017-07-24 18:25:05 +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

Moves code sections in tutorials to code files.

2017-10-01 23:33:15 +01:00

corda-api.rst

CORDA-704: Implement @DoNotImplement annotation (#1903)

2017-10-19 17:18:35 +01:00

corda-configuration-file.rst

New docs on deploying a node. Makes it clear existing docs were only for local or dev deployments.

2017-11-29 17:07:13 +00:00

corda-networks-index.rst

docs for additional-node-infos (#2107)

2017-11-24 13:27:30 +00:00

corda-nodes-index.rst

New docs on deploying a node. Makes it clear existing docs were only for local or dev deployments.

2017-11-29 17:07:13 +00:00

corda-repo-layout.rst

Moves code sections in tutorials to code files.

2017-10-01 23:33:15 +01:00

cordapp-build-systems.rst

Makes it clearer how to build a JAR. Removes ambiguous deployNodes content.

2017-12-07 16:39:52 +00:00

cordapp-overview.rst

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

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

demobench.rst

[CORDA-446] Clean up other mentions of network map node and logic (#1974)

2017-11-01 14:25:48 +00:00

deploying-a-node.rst

Merge branch 'master' into shams-master-merge-081217

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

event-scheduling.rst

Moves code sections in tutorials to code files.

2017-10-01 23:33:15 +01:00

faq.rst

Changes master docs to reflect M12 last-minute changes.

2017-06-09 13:59:39 +01:00

financial-model.rst

Further docsite changes, including reorganising the index.

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

flow-cookbook.rst

Flow cookbook added and merged into flow API page.

2017-06-22 16:13:54 +01:00

flow-library.rst

Replace data vending service with SendTransactionFlow (#964)

2017-08-04 11:26:31 +01:00

flow-state-machines.rst

* Move CompositeSignaturesWithKeys into net.corda.core.crypto package.

2017-10-02 16:03:07 +01:00

flow-testing.rst

CORDA-699 Add injection or modification of memory network messages (#1920)

2017-10-24 17:24:38 +01:00

generating-a-node.rst

New docs on deploying a node. Makes it clear existing docs were only for local or dev deployments.

2017-11-29 17:07:13 +00:00

getting-set-up.rst

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

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

glossary.rst

Removes references to clauses from the docs. (#1595)

2017-09-21 18:10:10 +01:00

hello-world-flow.rst

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

2017-11-16 15:31:52 +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

CORDA-311 Shell via SSH server (#2087)

2017-11-20 17:41:38 +00:00

hello-world-state.rst

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

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

hello-world-template.rst

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

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

index.rst

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

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

json.rst

Fixes docsite dead links.

2017-09-29 17:42:49 +01:00

key-concepts-consensus.rst

Further docsite changes, including reorganising the index.

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

key-concepts-contract-constraints.rst

CORDA-680 Update cordapp packages documentation (#1901)

2017-10-19 15:06:51 +01:00

key-concepts-contracts.rst

Further docsite changes, including reorganising the index.

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

key-concepts-ecosystem.rst

Further docsite changes, including reorganising the index.

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

key-concepts-flows.rst

Further docsite changes, including reorganising the index.

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

key-concepts-identity.rst

Add X500 name constraints for non-organisation attributes (#2108)

2017-11-22 18:00:43 +00:00

key-concepts-ledger.rst

Further docsite changes, including reorganising the index.

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

key-concepts-node.rst

Renamed "plugins" dir to "cordapps" (#1644)

2017-10-13 15:01:24 +01:00

key-concepts-notaries.rst

Further docsite changes, including reorganising the index.

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

key-concepts-oracles.rst

Further docsite changes, including reorganising the index.

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

key-concepts-states.rst

Further docsite changes, including reorganising the index.

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

key-concepts-time-windows.rst

Changes master docs to reflect M12 last-minute changes.

2017-06-09 13:59:39 +01:00

key-concepts-tradeoffs.rst

Docsite reorg ahead of beta launch.

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

key-concepts-transactions.rst

Further docsite changes, including reorganising the index.

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

key-concepts.rst

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

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

loadtesting.rst

Added throttling to the load test tool and added stability test. (#847)

2017-06-16 15:30:11 +01:00

messaging.rst

[CORDA-446] Clean up other mentions of network map node and logic (#1974)

2017-11-01 14:25:48 +00:00

network-map.rst

docs for additional-node-infos (#2107)

2017-11-24 13:27:30 +00:00

network-simulator.rst

Further docsite changes, including reorganising the index.

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

node-administration.rst

CORDA-311 Shell via SSH server (#2087)

2017-11-20 17:41:38 +00:00

node-database.rst

Updates the example CorDapp page.

2017-07-21 12:33:31 +01:00

node-explorer.rst

add message warning windows users they might need to manually kill explorer demo nodes started by gradle (#1717)

2017-09-28 16:44:05 +01:00

node-internals-index.rst

Cleaned up incorrect references to vault query and persistence. (#933)

2017-06-28 16:00:39 +01:00

node-services.rst

Some cleanup after network map removal (#2006)

2017-11-07 12:16:49 +00:00

oracles.rst

Moves code sections in tutorials to code files.

2017-10-01 23:33:15 +01:00

other-index.rst

Joel move api docs

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

out-of-process-verification.rst

Docsite reorg ahead of beta launch.

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

permissioning.rst

Updates permissioning docs to address RGB review comments.

2017-11-27 13:36:52 +00:00

quickstart-index.rst

Re-introduce demo docs (#1981)

2017-11-22 15:39:48 +00:00

release-notes.rst

CORDA-553 - Review comments

2017-12-01 16:59:19 +00:00

release-process-index.rst

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

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

running-a-node.rst

Fixes order of xmx commands.

2017-11-30 11:13:16 +00:00

running-a-notary.rst

Raft Notary: bootstrap command line flag

2017-11-14 13:51:21 +00:00

secure-coding-guidelines.rst

Docsite reorg ahead of beta launch.

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

serialization.rst

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

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

setting-up-a-corda-network.rst

Removed remaining references to networkMapService

2017-12-01 20:57:58 +00:00

shell.rst

New docs on deploying a node. Makes it clear existing docs were only for local or dev deployments.

2017-11-29 17:07:13 +00:00

soft-locking.rst

Improvements to Vault Query Service soft locked state querying (#1174)

2017-08-04 17:23:31 +01:00

testing.rst

Addressed release comments.

2017-09-05 17:38:53 +01:00

tools-index.rst

Further docsite changes, including reorganising the index.

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

troubleshooting.rst

New docs on deploying a node. Makes it clear existing docs were only for local or dev deployments.

2017-11-29 17:07:13 +00:00

tut-two-party-contract.rst

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

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

tut-two-party-flow.rst

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

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

tut-two-party-introduction.rst

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

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

tutorial-attachments.rst

AttachmentCriteriaQuery class and infrastructure (#2022)

2017-11-14 10:22:02 +00:00

tutorial-building-transactions.rst

Moves code sections in tutorials to code files.

2017-10-01 23:33:15 +01:00

tutorial-clientrpc-api.rst

[CORDA-758]: Permissions are now checked for each RPC method. (#1985)

2017-11-02 15:09:49 +00:00

tutorial-contract.rst

Remove unnecessary this in sample code + minor changes to contract paragraph

2017-10-06 11:33:58 +01:00

tutorial-cordapp.rst

New docs on deploying a node. Makes it clear existing docs were only for local or dev deployments.

2017-11-29 17:07:13 +00:00

tutorial-custom-notary.rst

Fixed AbstractNode to load custom notary services properly (#1720)

2017-10-13 10:36:25 +01:00

tutorial-integration-testing.rst

Moves code sections in tutorials to code files.

2017-10-01 23:33:15 +01:00

tutorial-observer-nodes.rst

Minor: add a discussion to recordTransactions.

2017-10-26 18:05:24 +02:00

tutorial-tear-offs.rst

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

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

tutorial-test-dsl.rst

Fixes an error in the contract testing tutorial.

2017-11-23 11:27:34 +00:00

tutorials-index.rst

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

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

upgrade-notes.rst

Adds upgrade notes for v1 to v2. Minor tweaks (e.g. ToC).

2017-11-22 17:33:40 +00:00

vault.rst

Cleaned up incorrect references to vault query and persistence. (#933)

2017-06-28 16:00:39 +01:00

versioning.rst

Introduced FlowLogic.getFlowContext which provides the flow version and app name of the other side.

2017-08-11 18:01:16 +01:00

writing-a-cordapp.rst

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

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