1531511096
Merge pull request #1291 from corda/amoothart-network-doc-typos
...
doc fixes
2018-07-27 11:58:52 -04:00
88158000e4
Fix merge conflict.
2018-07-26 10:31:03 +01:00
934109327c
Merge commit '78b61d4ae4d349aa7966dd0c9637d373f2df48d6' into chrisr3-os-merge
2018-07-26 10:22:33 +01:00
9c89e3babd
Merge commit '121dbec87700856679baab3995352448e8214b4e' into df-merge-2018-07-25
2018-07-25 18:00:24 +01:00
3259c4b64a
Tudor merge os 25 jul ( #1299 )
...
* Feature/corda 1813/change postgres column type (#3631 )
* CORDA-1813 fix Postgres db bloat issue
* CORDA-1813 merge fixes
* CORDA-1813 change column type and size to a standard corda type
* CORDA-1813 docs
* CORDA-1813 create custom hibernate type for the checkpoint blob and align with enterprise
* CORDA-1813 Remove max col size
* CORDA-1813 Remove max col size
* CORDA-1813 Fix merge
* CORDA-1813 Remove buggy :serverNameTablePrefix: configuration
* CORDA-1813 fix merge
2018-07-25 15:21:51 +01:00
9571f7d905
Removes Identity page. Reworks it into the Network page. ( #3687 )
...
* Removes Identity page. Reworks it into the Network page.
* Removes stray doorman reference.
* Addresses review feedback.
2018-07-25 13:13:10 +01:00
121dbec877
Merge pull request #3684 from EricMcEvoyR3/master
...
Docs added MacOSX version of Intellij Project Structure JDK Set-Up
2018-07-25 10:00:52 +01:00
40fc56f2ea
Feature/corda 1813/change postgres column type ( #3631 )
...
* CORDA-1813 fix Postgres db bloat issue
* CORDA-1813 merge fixes
* CORDA-1813 change column type and size to a standard corda type
* CORDA-1813 docs
* CORDA-1813 create custom hibernate type for the checkpoint blob and align with enterprise
* CORDA-1813 Remove max col size
* CORDA-1813 Remove max col size
* CORDA-1813 Fix merge
* CORDA-1813 Remove buggy :serverNameTablePrefix: configuration
2018-07-25 09:52:57 +01:00
c36aac5f5d
consistent cert organization
2018-07-24 16:08:39 -04:00
73ec84a0bc
Docs added MacOSX version of Intellij Project Structure JDK Set-Up
2018-07-24 17:33:55 +01:00
02fae5f385
Merge remote-tracking branch 'open/master' into os-merge-757181e
...
# Conflicts:
# node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/CordaPersistence.kt
# node/src/integration-test/kotlin/net/corda/node/services/messaging/ArtemisMessagingTest.kt
# node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
# node/src/main/kotlin/net/corda/node/internal/Node.kt
# node/src/main/kotlin/net/corda/node/services/messaging/P2PMessagingClient.kt
# node/src/main/kotlin/net/corda/node/services/vault/NodeVaultService.kt
# node/src/test/kotlin/net/corda/node/internal/NodeTest.kt
# node/src/test/kotlin/net/corda/node/services/identity/PersistentIdentityServiceTests.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/InternalMockNetwork.kt
2018-07-24 17:04:51 +01:00
757181e26d
Docs don't make it clear that folder should be selected, not parent folder. ( #3678 )
2018-07-24 16:42:34 +01:00
333970ae18
ENT-1993: Documentation for notary health check ( #1287 )
...
* Documentation for notary health check
* Doc improvements after review
* Indent (stop messing with this, IntelliJ!)
* Ordering, correct number
* Review comments
2018-07-24 14:41:53 +01:00
4708c62de4
Merge remote-tracking branch 'open/master' into os-merge-20180724
...
# Conflicts:
# CONTRIBUTORS.md
# docs/source/contributing.rst
# docs/source/corda-configuration-file.rst
# docs/source/index.rst
# node/src/integration-test/kotlin/net/corda/node/services/messaging/ArtemisMessagingTest.kt
# node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
# settings.gradle
2018-07-24 11:33:21 +01:00
b9efbaa228
CORDA-1585 - Tidy up participate docs + pdf toctree backport ( #3674 )
...
* Fix TOC for HTML and PDF (Backport from Enterprise docs)
* Tidy up participate section
* Address review comments
2018-07-24 10:05:57 +01:00
a4d65dae22
Merge remote-tracking branch 'remotes/open/master' into merges/july-23-11-26
...
# Conflicts:
# confidential-identities/src/test/kotlin/net/corda/confidential/IdentitySyncFlowTests.kt
# docs/source/changelog.rst
# node/src/integration-test/kotlin/net/corda/node/NodePerformanceTests.kt
# node/src/integration-test/kotlin/net/corda/node/services/AttachmentLoadingTests.kt
# node/src/integration-test/kotlin/net/corda/node/services/BFTNotaryServiceTests.kt
# node/src/integration-test/kotlin/net/corda/node/services/BFTSMaRtTests.kt
# node/src/main/kotlin/net/corda/node/internal/Node.kt
# node/src/main/kotlin/net/corda/node/internal/cordapp/JarScanningCordappLoader.kt
# node/src/main/kotlin/net/corda/node/internal/cordapp/ManifestUtils.kt
# node/src/test/kotlin/net/corda/node/CordaRPCOpsImplTest.kt
# node/src/test/kotlin/net/corda/node/internal/cordapp/JarScanningCordappLoaderTest.kt
# node/src/test/kotlin/net/corda/node/messaging/TwoPartyTradeFlowTests.kt
# node/src/test/kotlin/net/corda/node/services/TimedFlowTests.kt
# settings.gradle
# testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.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
2018-07-23 15:22:39 +01:00
a7b1175833
Extended docs on h2settings ( #3669 )
...
* Extended docs on h2settings
* Documents h2port being deprecated in favour of h2settings.
* Fixes link.
* Capitalisation
2018-07-23 14:15:09 +01:00
403a165ab6
Make it clear that must restart node after installing CorDapp. ( #3666 )
2018-07-23 11:37:44 +01:00
abc1d99eaa
[CORDA-1799]: Avoid generating test CorDapp JARs from each out of process node started by the driver ( #3641 )
2018-07-23 11:18:11 +01:00
c5e93cf5a4
Remove files not wanted in ent documentation
2018-07-23 09:06:43 +01:00
6427eb3937
ENT-2296 - Fix typo in docs ( #3665 )
2018-07-23 08:51:52 +01:00
168664f7a8
Merge remote-tracking branch 'open/master' into os-merge-20180722
...
# Conflicts:
# CONTRIBUTORS.md
# constants.properties
# docs/source/aws-vm-explore.rst
# docs/source/azure-vm-explore.rst
# docs/source/corda-networks-index.rst
# docs/source/gcp-vm.rst
# docs/source/getting-set-up.rst
# docs/source/node-database.rst
# finance/src/main/kotlin/net/corda/finance/contracts/asset/cash/selection/CashSelectionSQLServerImpl.kt
# finance/src/main/resources/META-INF/services/net.corda.finance.contracts.asset.cash.selection.AbstractCashSelection
# node/src/main/kotlin/net/corda/node/services/vault/NodeVaultService.kt
# node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt
2018-07-22 23:06:43 +01:00
624e1cbfe4
using TLS 1.2
2018-07-20 16:09:57 -04:00
0c0d9b7906
Azure template guide ( #1282 )
...
* Azure template guide and testnet docs update
2018-07-20 16:29:10 +01:00
d2446be69e
MSSQL support ( #3382 )
...
* MSSQL support
* changes per reviewer's comments; doc
* clean up
* CONTRIBUTORS.md
* minor change in comment
* another minor change in comment
* minor formatting
* Comments formatting per recommend style; contributors in alphabet order
* more comment formatting per coding style
* Change MSSQL to SQLServer in codes and comments
* Change MSSQL to SQLServer in doc
* Use generateSequence to build repeats of ?,?,...?
2018-07-20 16:25:15 +01:00
e5d82cc9b4
Na testnet explorer docs ( #3660 )
...
* added doc on testing deployment with node explorer
2018-07-20 16:21:24 +01:00
fae30c8703
Merge pull request #1285 from corda/2018-07-19
...
OS merge 2018-07-19
2018-07-20 14:12:57 +01:00
6e91fcbb32
Enable new test to run in remote database mode - add SQL setup, add finance packages to create tables by Liquidate. ( #1284 )
2018-07-20 14:09:58 +01:00
cad684fbd3
Add Ubuntu environment setup instructions to docs/getting-set-up ( #3608 )
...
* remove network simulator references in docs
* Added environment setup instructions for Ubuntu
* Revert "Upstream merge"
This reverts commit db4920fa68208ac49da0
2018-07-20 11:55:32 +01:00
62c2e1c892
OS merge 2018-07-19
2018-07-19 16:43:46 +01:00
a94dbc9c9a
Change SZ to CZ in the cert hierarchy diagram ( #3655 )
2018-07-19 16:07:50 +01:00
82d7ec0729
Na testnet screenshots ( #3647 )
...
* update docs/screenshots
2018-07-18 16:38:30 +01:00
08b5cb6d5f
Remove old future to event horizon not being implemented. ( #3642 )
2018-07-18 11:05:30 +01:00
aa50aaf95d
Merge commit 'e879de7' into chrisr3-os-merge
2018-07-17 22:47:24 +01:00
dafd979bde
CORDA-1818 - fix markup in h2 docs ( #3629 )
2018-07-17 17:47:46 +01:00
8a54badc6a
CORDA-1514 Add our patented nested Merkle trees protocol to documentation
2018-07-17 15:36:10 +01:00
921b132658
Deprecated freeLocalHostAndPort, freePort and getFreeLocalPorts of TestUtils ( #3630 )
...
They're prone to cause flaky tests due to the "allocated" ports already being taken by the system when eventually needed. Replaced usages with PortAllocation.Incremental.
Affected unit tests made into integration tests to avoid any issues in the future when unit tests are made to run in parallel.
2018-07-17 14:42:30 +01:00
a8fa232301
CORDA-1516 - Adding notary to key-concepts-transactions ( #3502 )
...
also decided not to include info about privacy salt (as too complex)
2018-07-17 11:53:53 +01:00
aee2377f4f
Add a doc on local configuration for a Corda testnet node. ( #3623 )
...
* Add a page on local deployment
* Add a page on local deployment
* Fix typos
* add image
* Added warning on copying nodes.
* Added warning
* Fix reviewer comments
* Update index
* broken note
* typo
2018-07-17 10:45:46 +01:00
1cffe1b080
Docs: update notary setup page
2018-07-17 11:26:55 +02:00
1ca2059863
[CORDA-1635] Update docs (node naming constraints). ( #3595 )
...
* Update docs (node naming constraints).
* Update CordaX500NameTest to ensure consistency with the docs.
* Respond to feedback.
2018-07-16 17:29:29 +01:00
a1cb184a1d
ENT-2168: Node internal docs tweaks ( #3624 )
2018-07-16 17:13:43 +01:00
ca56f6bd33
Fixed out-of-date integration testing tutorial and added Java example ( #3596 )
2018-07-16 13:14:57 +01:00
9f905da036
Missing upgrade notes for table change in v3.1 - related to CORDA-1804 ( #3567 )
...
Document different upgrade notes for table name change from v3.0 or from v3.1/v3.2 to the current version (a table change introduced in v3.1 was not documented in upgrade notes).
2018-07-16 11:43:24 +01:00
382d65fbb1
Merge pull request #3289 from corda/CORDA-1578/aslemmer-smm-extension-docs
...
CORDA-1578: Add flow state machine extension tutorial
2018-07-16 11:16:10 +01:00
a4ad4c7563
CORDA-1725 Add documentation on building Corda for Win/*nix and clean up doc bui… ( #3578 )
...
* Add documentation on building Corda for Win/*nix and clean up doc building documentation
* Split up building corda instructions from building docs instructions
* Address review comments
2018-07-13 22:12:20 +01:00
52eb5d76d3
Merge pull request #1272 from corda/parkri-os-merge-20180713-1
...
OS -> ENT merge
2018-07-13 18:05:29 +01:00
208ac49da0
CORDA-1804 Corda node stops when detecting not migrated node_attachments_contracts table name ( #3593 )
...
Database table NODE_ATTACHMENTS_CONTRACT_CLASS_NAME in v3.0 was changed to NODE_ATTCHMENTS_CONTRACTS in v3.1 and then finally NODE_ATTACHMENTS_CONTRACTS on current master. Users may omit the upgrade note and run into errors. After the change the node will not start if the new table name is not found and any other older ones is found.
2018-07-13 16:23:20 +01:00
4e81d26985
Merge remote-tracking branch 'remotes/open/master' into parkri-os-merge-20180713-1
2018-07-13 13:15:53 +01:00
84d387c034
Fix "getting set up" link ( #1270 )
2018-07-13 13:09:55 +01:00
