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
Nick Arini
017ffab60b
Testnet documentation pages ( #3287 )
...
* added doc page for running Corda on GCP vis Explore
* Fix bash code examples
* add images
* add images
* more typos fixed
* typo
* fix firewall commands
* more screenshots
* add screenshots for new projewct
* scale images
* screenshot
* added screenshot
* Bold steps
* more screenshots
* added screenshots
* upload screenshots
* added screenshots
* add contents
* add azure file
* add azure file
* updated azure screenshots
* updated azure screenshots
* more screenshots and text
* Updated run commands
* Updated run commands
* Update azure-vm-explore.rst
* Fix urls
* add AWS setup for explore
* aws screenshots
* update test for AWS
* aws screenshots
* aws screenshots
* add screenshots
* AWS updates
* AWS
* aws screenshot
* aws screenshots
* aws images
* aws updates
* aws updates
* aws screenshot
* Updated intro to new branding
* Added resoure group docs to azure page
* Updated azure screenshots
* Updated azure screenshots
* Updated azure screenshots
* Updated azure screenshots
* Updated aws docs
* Updated GCP docs
* Updated GCP docs
* Adding a Testnet overview page
* Adding a Testnet overview page
* Adding a Testnet overview page
* Adding a Testnet overview page
* Adding a Testnet overview page
* Adding a Testnet overview page
* Adding elastic IP to AWS
* Adding elastic IP to AWS
* Adding elastic IP to AWS
* updated dl link
* Update aws-vm-explore.rst
* update dl link
* Update gcp-vm.rst
* Fixing changes requested by RGB.
* Fixed link
* Additional changes requested in review.
* Updated based on RGB review comments.
* Minor formatting
* minor formatting
* Address review comments
* Address the review comments from RGB
* typo
* typo
* typo
* typo
* make underlines same length as headers
* Fix review comments
* Fix review comments
* fix review comments
* adding to index
2018-07-11 14:12:52 +01:00
Michele Sollecito
f7cdf915df
Merge remote-tracking branch 'remotes/open/master' into merges/july-10-15-51
2018-07-10 15:51:33 +01:00
Michele Sollecito
d9923f8809
Merge pull request #1238 from corda/anthony-os-merge-20180710
...
O/S Merge 2018-07-10
2018-07-10 15:48:10 +01:00
Joel Dudley
ab38c7a944
Consolidates and extends debugging information. ( #3548 )
...
* Consolidates and extends debugging information.
* Clearer remote debugging instructions.
2018-07-10 15:17:59 +01:00
Florian Friemel
e887d220bb
[ENT-1711] Update node monitoring docs. ( #1218 )
...
* [ENT-1711] Update node monitoring docs.
* [ENT-1711] Update node monitoring docs.
* [ENT-1711] Update node monitoring docs.
* [ENT-1711] Update node monitoring docs.
* Update node monitoring docs.
* Update node monitoring docs.
2018-07-10 14:28:02 +01:00
Michele Sollecito
fcbab670cf
[CORDA-1727]: Document more clearly the supported version of IntelliJ and the IntelliJ Kotlin Plugins. ( #3550 )
2018-07-10 14:06:20 +01:00
Michele Sollecito
f4972f922a
Revert "[ENT-2248]: Put back DP3 docs in the dropdown. ( #1245 )" ( #1247 )
...
This reverts commit a23a253caf1b5f88935f8f96079537d94cd568ea.
2018-07-10 14:05:58 +01:00
Michele Sollecito
a23a253caf
[ENT-2248]: Put back DP3 docs in the dropdown. ( #1245 )
...
https://r3-cev.atlassian.net/browse/ENT-2248
2018-07-10 13:42:21 +01:00
Tommy Lillehagen
e51ef04560
ENT-1955 - Fix TOC for HTML and PDF ( #1244 )
2018-07-10 13:30:08 +01:00
Tommy Lillehagen
1751b59694
Use absolute path for versions endpoint in docs ( #1242 )
2018-07-10 13:24:23 +01:00
Michele Sollecito
9dd1717f71
[ENT-2241]: Fixed unclear getting set up instructions. ( #1241 )
2018-07-10 13:23:54 +01:00
Michele Sollecito
3c56605895
[ENT-2244]: Link to pdf of the Product Documentation disappeared from the docsite (fix). ( #1240 )
...
(cherry picked from commit 848c255)
2018-07-10 13:15:24 +01:00
Tushar Singh Bora
a4b2096b01
Update Shell.rst with CashIssueFlow ( #3546 )
...
* Updated for issue: 3120
https://github.com/corda/corda/issues/3120- for details
* Updated shell.rst
Correct Shell Flow usaged for CashIssueFlow
* Updated Shell.rst as per latest CashIssueFlow
2018-07-10 11:58:26 +01:00
Anthony Keenan
8d7aa5f590
Merge remote-tracking branch 'open/master' into anthony-os-merge-20180710
...
# Conflicts:
# .idea/compiler.xml
# docs/source/changelog.rst
# docs/source/network-bootstrapper.rst
# node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
# node/src/main/kotlin/net/corda/node/services/identity/IdentityServiceUtil.kt
# node/src/main/kotlin/net/corda/node/services/identity/PersistentIdentityService.kt
2018-07-10 11:19:23 +01:00
Dan Newton
7b4ace16e1
Remove duplicated code between PersistentIdentityService and InMemoryIdentityService ( #3428 )
2018-07-10 08:35:14 +01:00
Viktor Kolomeyko
13af5e00b6
Merge pull request #1231 from corda/feature/vkolomeyko/os-merge
...
OS->Ent merge
2018-07-09 21:17:46 +01:00
Anthony Keenan
4f5c8e0052
Add missing chapter to index and re-org PDF ( #1233 )
2018-07-09 17:55:19 +01:00
Gavin Thomas
c4d3522ddc
ENT-2100 quick start page to include user journeys ( #3523 )
...
* ENT-2100 quick start page to include user journeys
* Restructures table.
* add anchors for easy navigation
* fix anchors for easy navigation
* another fix anchors for easy navigation
* Reformats table.
* another fix anchors for easy navigation
* and another fix anchors for easy navigation
* and yet another fix anchors for easy navigation
* table tweak
* table header fix
* add missing table headers
2018-07-09 17:40:18 +01:00
Anthony Keenan
857ed1897a
CORDA-1712 - Make documentation clearer for Network Bootstrapper ( #3504 )
2018-07-09 17:38:31 +01:00
szymonsztuka
d35bf8442f
Fix formatting in node database doc. ( #1230 )
2018-07-09 17:22:10 +01:00
Viktor Kolomeyko
61a8bd0a5a
Merge remote-tracking branch 'open/master' into feature/vkolomeyko/os-merge
...
# Conflicts:
# samples/attachment-demo/src/integration-test/kotlin/net/corda/attachmentdemo/AttachmentDemoTest.kt
2018-07-09 16:45:20 +01:00
szymonsztuka
7e7ea3bab7
Document database configuration step when deploying nodes remotely, related to ENT-1678( #1224 )
2018-07-09 16:14:18 +01:00
Joel Dudley
f389cd07a3
Lower-case m. ( #3536 )
2018-07-09 15:22:01 +01:00
Joel Dudley
ed61e1609a
Adds tables of content for network sections. ( #3537 )
2018-07-09 15:21:47 +01:00
Shams Asari
5d55a87d70
Merge remote-tracking branch 'open/master' into os-merge-aefd90f
...
# Conflicts:
# CONTRIBUTORS.md
2018-07-09 12:33:47 +01:00
Joel Dudley
0de7c2aaf4
Command should not have leading slash. ( #3534 )
2018-07-09 12:05:40 +01:00
Florian Friemel
a2496a752c
[Ent-2176] ( #1126 ) ( #1227 )
2018-07-09 11:54:36 +01:00
Florian Friemel
0670634bad
Update tutorial-test-dsl.rst ( #3483 )
2018-07-09 09:58:45 +01:00
Tommy Lillehagen
8a8bc55cd7
ENT-2229 - Change PDF title ( #1215 )
2018-07-07 10:09:43 +01:00
Anthony Keenan
4956dbf9f0
Merge pull request #1213 from corda/anthony-os-merge-20180705
...
O/S Merge 20180705
2018-07-06 12:43:24 +01:00
Rick Parker
d03f31e178
ENT-1951 Storage usage from performance tests ( #1216 )
...
* ENT-1951 Storage usage from performance tests
* Qualify database used
* Review feedback
2018-07-06 11:01:45 +01:00
szymonsztuka
431538cc31
Added example command to create dummy JAR file with migration for upgrading Cordapp from OS to ENT. ( #1187 )
2018-07-06 10:56:01 +01:00
Anthony Keenan
3203bdae97
Merge from O/S
2018-07-05 19:09:25 +01:00
Shams Asari
300e0573fe
Merge pull request #1205 from corda/os-merge-244167d
...
O/S merge from 244167d
2018-07-05 17:16:52 +01:00
Chris Rankin
5106b01832
CORDA-1699: Restore binary compatibility for UniqueIdentifier class. ( #3505 )
...
* Update JarFilter to remove certain annotations from primary constructors.
* Enhance unit tests for deleting constructors.
* Update the documentation to explain how to handle non-deterministic default
constructor parameters.
* Reduce the base logging level of SanitisingTransformer to DEBUG.
* Simplify the execution of repeatable ClassVisitors.
* Simplify Gradle usage slightly.
* Add test for deterministic UniqueIdentifier.
* Update README to cover handling default parameters.
2018-07-05 16:14:56 +01:00
Shams Asari
c4d0a62ceb
Merge branch 'master' into os-merge-244167d
2018-07-05 15:47:09 +01:00
Shams Asari
0c8c914882
Removing warnings
2018-07-05 15:45:28 +01:00
Maksymilian Pawlak
f3dc018f04
Clarify local shell is dev-mode only ( #3479 )
2018-07-05 15:41:49 +01:00
Matthew Nesbit
123a2af5e0
Bridge to Firewall renames
...
More renaming
Update diagrams
Update changelog to point out breaking change fo the rename
Address Richard's PR comments
2018-07-05 15:20:28 +01:00
Tommy Lillehagen
28561280d0
ENT-1955, ENT-2227 - Documentation scrub and TOC update ( #1209 )
...
* ENT-1955 - Fix capitalisation of page headings
* ENT-2227 - Remove design proposals from enterprise docs
* ENT-1955 - Fix formatting issue in release notes
* ENT-1955 - Miscellaneous updates and formatting fixes
* ENT-1955 - Update title of Corda Firewall
2018-07-05 15:00:43 +01:00
Tommy Lillehagen
2f4642e0fc
ENT-1997 - Port doc changes for getting set up from release branch ( #1207 )
2018-07-05 14:04:01 +01:00
Tommy Lillehagen
9fa9521ae8
ENT-2191 - Add version compatibility and platform support matrices ( #1195 )
...
* ENT-2191 - Add version compatibility and platform support matrices
* ENT-2191 - Add note re compatibility commitments
2018-07-05 11:22:14 +01:00
Anthony Keenan
df198acf59
Fixing md formatting sphinixification issues ( #3510 )
2018-07-05 09:40:36 +01:00
Tudor Malene
2ab5a4cf12
CORDA-1392 Make Hibernate entities non-Serializable ( #3458 )
...
* CORDA-1392 Make Hibernate entities non-Serializable
* CORDA-1392 Make Hibernate entities non-Serializable - fix api
* CORDA-1392 Fix determinise
* CORDA-1392 Add changelog entry
* CORDA-1392 Address code review changes
2018-07-05 09:37:30 +01:00
Shams Asari
20a589d66d
Merge remote-tracking branch 'open/master' into os-merge-244167d
...
# Conflicts:
# docs/source/example-code/src/main/kotlin/net/corda/docs/FlowCookbook.kt
# docs/source/example-code/src/main/kotlin/net/corda/docs/LaunchSpaceshipFlow.kt
# docs/source/example-code/src/main/kotlin/net/corda/docs/tutorial/tearoffs/TutorialTearOffs.kt
# docs/source/running-a-node.rst
# experimental/behave/build.gradle
# experimental/behave/src/scenario/kotlin/net/corda/behave/scenarios/helpers/Substeps.kt
# experimental/kryo-hook/build.gradle
# experimental/quasar-hook/build.gradle
# node/src/integration-test/kotlin/net/corda/node/AuthDBTests.kt
# node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
# node/src/test/java/net/corda/node/services/vault/VaultQueryJavaTests.java
# node/src/test/kotlin/net/corda/node/internal/NodeTest.kt
# node/src/test/kotlin/net/corda/node/services/messaging/ArtemisMessagingTest.kt
# node/src/test/kotlin/net/corda/node/services/persistence/HibernateConfigurationTest.kt
# samples/attachment-demo/src/integration-test/kotlin/net/corda/attachmentdemo/AttachmentDemoTest.kt
# samples/irs-demo/src/integration-test/kotlin/net/corda/test/spring/SpringDriver.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/NodeBasedTest.kt
2018-07-04 18:38:34 +01:00
szymonsztuka
d72caf59f0
Document running nodes on a remote machine after generating them on a local machine with Cordform task (related to ENT-1678) ( #3516 )
2018-07-04 18:34:17 +01:00
Rick Parker
9b3044186d
ENT-1860 Enterprise sizing guidelines ( #1193 )
2018-07-04 17:43:21 +01:00
Shams Asari
244167d3e9
Enabled warnings as errors ( #3514 )
2018-07-04 17:17:27 +01:00
Joel Dudley
f103bdc98a
Document node command-line options ( #3490 )
...
* Document node command-line options
* Addresses review feedback.
2018-07-04 10:41:38 +01:00