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

12326 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tudor Malene
8c1c19fdf8
CORDA-1477 add check before db evolution that there are no checkpoints. (#967) 
* CORDA-1477 add check before db evolution that there are no checkpoints.

* CORDA-1477 address code review comments
 2018-06-11 16:24:24 +01:00
Mike Hearn
6cc08776b5
Docs: move json to the development section (#3343) 2018-06-11 17:13:45 +02:00
Andras Slemmer
b0d86e04d7 Merge remote-tracking branch 'open/master' into aslemmer-os-merge-11-jun 2018-06-11 16:05:39 +01:00
Andras Slemmer
9793662719 Merge remote-tracking branch 'open/master' into aslemmer-os-merge-11-jun 2018-06-11 15:57:29 +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
Andras Slemmer
c66228adf4
Merge pull request #3285 from corda/CORDA-1191/aslemmer-fix-smm-bugs 
CORDA-1191 SMM bugs
 2018-06-11 15:46:56 +01:00
szymonsztuka
5ee242de4f
Merge pull request #968 from corda/merges/os-2018-06-11-a590d5e 
OS merge on 2018-06-11 up to a590d5e
 2018-06-11 15:46:43 +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
Andrius Dagys
a590d5e0b3
CORDA-1494: Remove isTimed check from flow hospital when handling tim… (#3337) 
* CORDA-1494: Remove isTimed check from flow hospital when handling timeout exceptions - the timeout might expire just after the TimeFlow has finished and the staff member would throw an exception.

Increase the default flow timeout value in mock network so retries don't happen – this has cause test flakiness.
 2018-06-11 13:17:22 +01:00
Maksymilian Pawlak
c009cbd91a
[CORDA-1468] Properly handle entites where NULLs can be inserted into DB (#3324) 
* Allow proper null values on entities which fields can get NULL values.
 2018-06-11 13:12:19 +01:00
Joel Dudley
1aa1189b36
Documents providing an SSHD port in deployNodes (#3341) 2018-06-11 12:37:22 +01:00
Andrius Dagys
2558c9dcf7 CORDA-1588: Add an extra check in the attachment resolution flow to prevent duplicate attachment import if multiple transactions with the same attachment are being resolved at the same time. 2018-06-11 11:56:32 +01:00
Rick Parker
8ac7690987
CORDA-1599 killFlow RPC call does not remove records from the Flow Hospital, if there are any. (#3332) 
* CORDA-1599 Add a mechanism so killFlow can clean up the in memory data structures held by the Flow Hospital and other transition executor implementations.

* Fix bug and test

* Fix bug and test
 2018-06-11 11:24:12 +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
Joel Dudley
92c499d0b8
Update CONTRIBUTORS.md 2018-06-09 13:33:50 +01:00
Venelin Stoykov
23e8f94f47 Docs: flowTracker to progressTracker (#3316) 
Resolve #3291
 2018-06-09 13:33:02 +01:00
Richard Gendal Brown
aa8e7a86ef Correct typos and attribution errors (#3335) 2018-06-09 09:21:58 +01:00
Patrick Kuo
072b4207e0 CORDA-1604 Node Info file watcher should block and load node info when node startup (#959) (#3333) 
(cherry picked from commit 2fce979)
 2018-06-08 18:39:46 +01:00
Maksymilian Pawlak
8668f4aa3b
[CORDA-1494] Enable TimeFlow test integration tests to run properly with external DBs (#962) 2018-06-08 18:17:39 +01:00
Maksymilian Pawlak
003684b7fb
[ENT-1837] Better message, but retain original exception (#3330) 
* Retain original exception
 2018-06-08 18:14:59 +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
Patrick Kuo
2fce979fe7 CORDA-1604 Node Info file watcher should block and load node info when node startup (#959) 2018-06-08 16:30:37 +01:00
Stefano Franz
68e1d281bc
Merge pull request #960 from roastario/remove_launcher_as_runtime_from_node 
Remove launcher as runtime dependency from node
 2018-06-08 15:45:02 +01:00
Stefano Franz
b9ed001358 remove runtime dependency on launcher for node as the capsule launching process is still used if not running from official distribution 2018-06-08 14:22:06 +01:00
josecoll
002d5a8f10
Publish tools to Artifactory: Blob Inspector, Network Bootstrapper (#3321) 
* Added missing plugin to enable publishing of artifact to Artifactory.

* Remove references to experimental blobinspector

* Remove disableDefaultJar for default jar.

* Add additional artifacts to be published.
 2018-06-08 14:02:57 +01:00
Stefano Franz
984dcf3100
Merge pull request #958 from roastario/publish_launcher 
add launcher to list of published artifacts
 2018-06-08 14:02:19 +01:00
szymonsztuka
72d47bb41b
Merge pull request #956 from corda/merges/os-2018-06-08-szymon 
OS -> ENT merge up to baa6479
 2018-06-08 13:28:19 +01:00
Stefano Franz
e470fa60c0 add launcher to list of published artifact:wq 2018-06-08 12:32:49 +01:00
Joel Dudley
238dc477e3
Only 7 terminal windows appear (notary's was removed). (#3328) 2018-06-08 12:15:44 +01:00
szymonsztuka
04cb9c9872 Add copyright to source files. 2018-06-08 11:05:29 +01:00
szymonsztuka
e266c8c2a7 Add copyright to source files. 2018-06-08 11:02:16 +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
Shams Asari
443277ef60
Merge pull request #954 from corda/os-merge-21280c0 
O/S merge from 21280c0
 2018-06-08 10:38:17 +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
Tudor Malene
b9bf624e7a
ENT-1873 address code review changes (#3323) 2018-06-08 10:24:00 +01:00
Tudor Malene
f4f8bc3c8c
Reapply lost fix (#952) 2018-06-08 10:23:27 +01:00
Joel Dudley
0cab721b47
Documents use of $ to access internal classes. (#3325) 2018-06-08 10:23:05 +01:00
Shams Asari
ef5faeaf26 Merge fix 2018-06-07 18:14:44 +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
Tudor Malene
db3da50070
Merge pull request #953 from corda/tudor-os-merge-7-jun 
Tudor os merge 7 jun
 2018-06-07 18:00:15 +01:00
Andras Slemmer
6661ee8a3e Add doc 2018-06-07 17:08:20 +01:00
Andras Slemmer
768d9309dc Various tests and fixes related to CORDA-1191 2018-06-07 16:51:04 +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
tudor.malene@gmail.com
5140d46aa2 Merge remote-tracking branch 'open/master' into tudor-os-merge-7-jun 
# Conflicts:
#	node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
#	node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt
 2018-06-07 16:05:11 +01:00
Andrius Dagys
e7d98f52aa
Merge pull request #945 from corda/andrius/merge-06-07 
OS merge
 2018-06-07 15:59:35 +01:00
Andrius Dagys
65eddbb025 CORDA-1494: Handle TimedFlow in MultiThreadedStateMachineManager 2018-06-07 14:29:15 +01:00