ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-02-19 17:08:05 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
12,230 Commits 96 Branches 407 Tags
Commit Graph

1766 Commits

Author SHA1 Message Date
Andras Slemmer
8038343065
Merge pull request #973 from corda/aslemmer-os-merge-11-jun 
Aslemmer os merge 11 jun
 2018-06-11 19:48:10 +01:00
Tudor Malene
db00190d71
CORDA-1558 document clarification (#972) 
* CORDA-1558 document clarification

* CORDA-1558 address code review changes
 2018-06-11 17:57:29 +01:00
Andras Slemmer
b0d86e04d7 Merge remote-tracking branch 'open/master' into aslemmer-os-merge-11-jun 2018-06-11 16:05:39 +01:00
Andrius Dagys
85fe0e4cb1
CORDA-1494: Rename p2pMessagingRetry configuration to flowTimeout configuration to reflect the change in how retries are implemented – it is now on flow rather than message level. (#3339) 2018-06-11 15:50:06 +01:00
szymonsztuka
8f225735ae Merge remote-tracking branch 'remotes/open/master' into bugs/os-2018-06-a590d5e 2018-06-11 14:10:57 +01:00
szymonsztuka
98e58b282c Resolved merge conflicts. 2018-06-11 13:40:38 +01:00
Michele Sollecito
c5d44e3758
[ENT-1997]: Document Corda Enterprise set-up for CorDapp developers. (#950) 2018-06-11 13:28:42 +01:00
Joel Dudley
1aa1189b36
Documents providing an SSHD port in deployNodes (#3341) 2018-06-11 12:37:22 +01:00
bpaunescu
8128c7d93f
ENT-2017: update ha guide to include warning about SMB 3.0 (#931) 
* ENT-2017: update ha guide to include warning about SMB 3.0 and OS incompatibilities

* ENT-2017: address PR comments

* ENT-2017: replace old ha guide references with new ones
 2018-06-11 11:06:49 +01:00
Venelin Stoykov
23e8f94f47 Docs: flowTracker to progressTracker (#3316) 
Resolve #3291
 2018-06-09 13:33:02 +01:00
szymonsztuka
68fcda5548
ENT-1709 Documentation for standalone database setup (#949) 
Added SQL scripts to create database/clean up database, example CordFormation to use with remote database, several clarifications.
 2018-06-08 16:50:47 +01:00
Joel Dudley
238dc477e3
Only 7 terminal windows appear (notary's was removed). (#3328) 2018-06-08 12:15:44 +01:00
szymonsztuka
d4d459cf22 Merge remote-tracking branch 'remotes/open/master' into merges/os-2018-06-08-szymon 2018-06-08 10:57:50 +01:00
szymonsztuka
baa6479575
ENT-1712 Warning on cross-reference between JPA entities from different mapped schemas (#3282) 
At startup node warns about any MappedSchema containing a JPA entity referencing to another JPA entity from a different MappedSchema. Cross reference between JPA entities across different MappedSchema objects can cause operational issues while evolving one MappedSchema object or migrating it's data. Doc API: Persistence documentation no longer suggests mapping between different schemas.
 2018-06-08 10:25:50 +01:00
Joel Dudley
0cab721b47
Documents use of $ to access internal classes. (#3325) 2018-06-08 10:23:05 +01:00
Shams Asari
7886ef9450 Merge remote-tracking branch 'open/master' into os-merge-21280c0 
# Conflicts:
#	node/src/main/kotlin/net/corda/node/services/statemachine/FlowHospital.kt
#	node/src/main/kotlin/net/corda/node/services/statemachine/PropagatingFlowHospital.kt
 2018-06-07 18:08:37 +01:00
Chris Rankin
21280c029e
ENT-1463, ENT-1903: Document the "determinisation" process. (#3297) 2018-06-07 16:49:39 +01:00
Shams Asari
f6a23a0216
CORDA-1546: Updated the flow hospital to suspend FinalityHandler if it errors (#3304) 
It will re-run automatically from last checkpoint on node restart, allowing the opportunity to resolve the issue, something required when dealing with contract constraint failures.
 2018-06-07 16:18:00 +01:00
Joel Dudley
9514ad6be1
Workaround if six is already installed. (#3320) 
* Help message if build fails.

* Fix formatting.
 2018-06-07 16:13:59 +01:00
szymonsztuka
d821f6d9e3
ENT-2035 / ENT-2037 Document JDBC driver in ./drivers directory (#939) 
Enterprise tarball Corda distribution can only load JDBC jars from relative ./drivers directory.
The Capsule version can use directory specified by jarDirs config property and jarDirs was documented as a way to add JDBC drivers.
To make it consistent between tarball and Capsule version enterprise docs will be updated to use ./drivers dir, still preserving jarDirsbut state this option is not advisable and depending on the distribution may not work.
 2018-06-07 10:35:00 +01:00
Michele Sollecito
4bb548c09b
[ENT-1894]: Change old log for new red-white one. (#941) 2018-06-06 17:02:58 +01:00
tudor.malene@gmail.com
5232c2e0e3 Merge remote-tracking branch 'open/master' into tudor-merge-6-Jun 2018-06-06 13:38:45 +01:00
Mike Hearn
468c0c7404
CORDA-1349: Docs: improve docs on permissioning, doorman and network map. (#3277) 
* Docs: improve docs on permissioning, doorman and network map.

* Add a convenience serialization API for Java users, marked as
internal for now with a TODO to make it public after we start work on
Corda 4.0. Otherwise serializing arbitrary objects to AMQP is awkward.
 2018-06-06 13:57:25 +02:00
Shams Asari
11fd70a1f7 Merge remote-tracking branch 'open/master' into os-merge-d620e71 
# Conflicts:
#	node/src/main/kotlin/net/corda/node/serialization/kryo/Kryo.kt
 2018-06-06 09:51:29 +01:00
Shams Asari
d620e71bb6
Replaced all uses of assert with require (#3309) 
JVM assertions have to be enabled with the -ea flag so it's possible for these checks to be ignored.
 2018-06-06 00:31:41 +01:00
Shams Asari
75f2c4a0a4
Removed flow-library doc page as it's redundant (#3307) 2018-06-05 21:43:03 +01:00
Matthew Nesbit
4882e2e089 Merge remote-tracking branch 'remotes/open/master' into mnesbit-merge-20180605 2018-06-05 13:37:35 +01:00
Joel Dudley
086b9daa6e
Updates the setup instructions to be IntelliJ 2018 compatibile. (#3299) 2018-06-05 10:57:29 +01:00
Katelyn Baker
010c30f6d4
DOCS - Remove references to webAddress since it's no longer a valid option (#3293) 2018-06-05 10:57:19 +01:00
Joel Dudley
7bf6608c8e
Fixes webport numbers based on recent build.gradle changes. (#3298) 2018-06-05 10:15:47 +01:00
sollecitom
61127fe65f Merge remote-tracking branch 'remotes/open/master' into merges/june-05-09-57 2018-06-05 09:58:28 +01:00
Joel Dudley
d989ae9dcc
Stray backtick. 2018-06-04 23:20:26 +01:00
szymonsztuka
f5c9a398ad Merge remote-tracking branch 'remotes/open/master' into merges/os-2018-06-04-szymon 
# Conflicts:
#	docs/source/upgrade-notes.rst
#	node/src/integration-test/kotlin/net/corda/node/BootTests.kt
 2018-06-04 17:35:19 +01:00
Tudor Malene
4f1a22dfac
Merge pull request #910 from corda/tudor-merge-os-01_06 
Tudor merge os 01 06
 2018-06-04 15:37:33 +01:00
Michele Sollecito
fc020bca4b
[CORDA-1575]: Out of process nodes started by the driver do not log to file (fix). (#3286) 2018-06-01 16:16:23 +01:00
szymonsztuka
57d379597b
Fix a typo in node_attchments_contracts table name. (#3202) 2018-06-01 16:08:19 +01:00
Katelyn Baker
c56e4a12e9
Merge branch 'master' into kat-remove-network-services 2018-06-01 15:00:13 +01:00
Shams Asari
b7fbebb490
Cleaned up blob inspector doc (#3284) 2018-06-01 14:26:58 +01:00
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
Tudor Malene
9efb1ecfe0
CORDA-1477 add check for code version in checkpoints (#3256) 
* CORDA-1477 add check for code version in checkpoints

* CORDA-1477 Comment style

* CORDA-1477 address code review comments

* CORDA-1477 add changelog entry

* CORDA-1477 attempt to fix tests

* CORDA-1477 attempt to fix tests and address code review comments

* CORDA-1477 attempt to fix tests
 2018-06-01 13:37:39 +01:00
Mike Hearn
39548aefe2
ENT-1888: Docs: improve rendering of the database migration document. (#902) 
Docs: improve rendering of the database migration document.
 2018-06-01 13:20:51 +02:00
Katelyn Baker
3eb1ba9faa review comments 2018-06-01 11:50:30 +01:00
Mohamed Amine LEGHERABA
edb462eb06 update azure documentation (#2950) 
add yo!app deployment for Corda V2
 2018-06-01 09:26:07 +01:00
sollecitom
c0ddb0b026 Merge remote-tracking branch 'remotes/open/master' into merges/may-31-19-04 
# Conflicts:
#	docs/source/network-map.rst
 2018-05-31 19:06:28 +01:00
Katarzyna Streich
74fd5b9e9d
Add documentation on clearing network map cache (#3280) 
Add documentation on clearing network map cache

CORDA-1562
 2018-05-31 17:44:38 +01:00
Katelyn Baker
f56f07b34a REFACTOR - Removing Network Services code and docs 2018-05-31 13:48:56 +01:00
Shams Asari
27e688e2c8
Merge pull request #895 from corda/os-merge-5d1cc0b 
O/S merge from 5d1cc0b
 2018-05-31 11:14:15 +01:00
Tudor Malene
fd2f2eb14a ENT-1871 Rebrand R3Corda to Corda Enterprise (#838) 
* ENT-1871 Rebrand R3Corda to Corda Enterprise

* ENT-1871 Address code review comments

* ENT-1871 Address code review comments

* ENT-1871 Address code review comments

* ENT-1871 Address code review comments
 2018-05-31 08:59:05 +01:00
Shams Asari
03fae9bd7d Merge branch 'merge-5d1cc0b' into os-merge-5d1cc0b 
# Conflicts:
#	.idea/compiler.xml
#	node/src/main/kotlin/net/corda/node/services/statemachine/SingleThreadedStateMachineManager.kt
#	node/src/main/kotlin/net/corda/node/services/statemachine/transitions/StateMachine.kt
 2018-05-30 21:47:48 +01:00
Konstantinos Chalkias
5d1cc0bd54
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