ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-24 23:26:48 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
8,903 Commits 91 Branches 405 Tags 354 MiB
8a37108a58
Commit Graph

8903 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Waldemar Żurowski
99b761e0e2
Merge pull request #6381 from corda/merge-44-to-45 
NOTICK: merge Corda OS 4.4 to 4.5
 2020-06-19 19:44:13 +01:00
Waldemar Zurowski
f1fcce4247 Merge branch 'release/os/4.4' into merge-44-to-45 2020-06-19 19:42:19 +01:00
Waldemar Żurowski
8a601e6d62
Merge pull request #6380 from corda/merge-43-to-44 
NOTICK: forward merge from Corda OS 4.3 to 4.4
 2020-06-19 19:35:19 +01:00
Waldemar Zurowski
f7b38f0b6d Merge branch 'release/os/4.3' into merge-43-to-44 2020-06-19 19:32:55 +01:00
Waldemar Żurowski
23f81e73a6
Remove obsolete Jenkins configration for smoke tests (#6379) 2020-06-19 19:30:11 +01:00
Razvan Codreanu
618f7211bb
NOTICK fix regression jenkinsfile typo (#6376) 2020-06-19 18:25:08 +01:00
Razvan Codreanu
ad21e381dc
INFRA-357 Adding JDK 11 Regression and Build tag jenkinsfile (#6374) 2020-06-19 14:10:31 +01:00
Waldemar Żurowski
f7f2b0cea4
Merge pull request #6373 from corda/merge-44-45 
NOTICK: merging OS 4.4 with OS 4.5
 2020-06-19 11:34:39 +01:00
Waldemar Zurowski
68771cf430 Merge branch 'release/os/4.4' into merge-44-45 2020-06-19 11:02:34 +01:00
pnemeth
d6cab0e131
EG-1557 - Configuration data from "include" section ignored while command line contains the path to config file without leading ./ (#6354) 
Configuration data from "include" section ignored while command line contains the path to config file without leading ./
 2020-06-19 10:32:55 +01:00
alicer3
e77f7a7546
center console message for registration (#6191) 2020-06-19 09:49:07 +01:00
Euan Cairncross
4bfb595e57
INFRA-357 - Add release tag Jenkins build for OS 4.4 (#6362) 2020-06-18 23:46:29 +01:00
Waldemar Żurowski
494073590b
INFRA-347: Corda builds for Windows Servers (#6356) 2020-06-18 23:19:06 +01:00
Dan Newton
71b2a43221
Merge pull request #6372 from corda/dan/os-4.5-to-4.6-merge-2020-06-18 
NOTICK OS 4.5 to 4.6 merge 2020-06-18
 2020-06-18 17:04:42 +01:00
LankyDan
56d0bbc036 CORDA-3841 Check isAnyCheckpointPersisted in startFlowInternal (#6351) 
Only hit the database if `StateMachineState.isAnyCheckpointPersisted`
returns true. Otherwise, there will be no checkpoint to retrieve from the
database anyway. This can prevent errors due to a transient loss of
connection to the database.

Update tests after merging to 4.6
 2020-06-18 16:15:15 +01:00
LankyDan
e8b17ff7b9 Merge branch 'release/os/4.5' into dan/os-4.5-to-4.6-merge-2020-06-18 
# Conflicts:
#	node/src/main/kotlin/net/corda/node/services/persistence/DBCheckpointStorage.kt
#	node/src/main/kotlin/net/corda/node/services/statemachine/SingleThreadedStateMachineManager.kt
 2020-06-18 15:50:46 +01:00
Razvan Codreanu
813e9dd242
INFRA-394 enable full junit log to avoid truncation (#6368) 2020-06-18 12:52:33 +01:00
Matthew Nesbit
5b3ca5f112
Merge pull request #6367 from corda/chrisr3-os44-merge 
NOTICK: Merge from OS 4.4 -> OS 4.5 up to fe61781
 2020-06-18 12:03:21 +01:00
Chris Rankin
1ef62870bb Merge commit 'fe617818895edab334d80c5e8de2b38f39e67af6' into chrisr3-os44-merge 2020-06-17 18:54:54 +01:00
Rick Parker
fe61781889
Merge pull request #6358 from corda/adel/merge-4.3-to-4.4-17June 
Merge OS 4.3 to OS 4.4
 2020-06-17 18:13:55 +01:00
Chris Rankin
d0c0a1d9ba
ENT-5430: Fix deserialisation of commands containing generic types. (#6359) 2020-06-17 17:28:26 +01:00
Walter Oggioni
d1482fb6a8
removed duplicate gradle include (#6330) 
subproject `tools:checkpoint-agent` is already included at line 63
 2020-06-17 17:13:30 +01:00
Chris Rankin
0f1bfb13da
CORDA-3831: Prevent CordappImpl TEST_INSTANCE crashing node when PWD is file-system root directory. (#6360) 2020-06-17 16:09:03 +01:00
James Higgs
24b0240d82
EG-2654 - Ensure stack traces are printed to the logs in error reporting (#6345) 
* EG-2654 Ensure stack trace is printed to the logs in error reporting

* EG-2654 - Add a test case for exception logging
 2020-06-17 14:32:12 +01:00
Adel El-Beik
debc962d1d Merge remote-tracking branch 'origin/release/os/4.3' into adel/merge-4.3-to-4.4-17June 2020-06-17 10:06:34 +01:00
Dan Newton
7ab6a8f600
CORDA-3841 Check isAnyCheckpointPersisted in startFlowInternal (#6351) 
Only hit the database if `StateMachineState.isAnyCheckpointPersisted`
returns true. Otherwise, there will be no checkpoint to retrieve from the
database anyway. This can prevent errors due to a transient loss of
connection to the database.
 2020-06-16 09:22:26 +01:00
Tamas Veingartner
26d4bfb89f
CORDA-3578 add corda prefix to conf file names as original issue was … (#6322) 
* CORDA-3578 add corda prefix to conf file names as original issue was having non-corda reference.conf files on classpath causes DriverDSLImp failure

it is better to have this naming convention and avoid further conflicts of conf files.

* fixed weird duplicates

* revert renaming changes for web-reference.conf and loadtest-reference.conf
 2020-06-16 09:15:51 +01:00
Dan Newton
2a2f04e568
Merge pull request #6347 from corda/raz/os45to46 
NOTICK: MERGE OS 4.5 -> OS 4.6
 2020-06-15 10:39:00 +01:00
Schife
c47c586955 Merge branches 'release/os/4.5' and 'release/os/4.6' of https://github.com/corda/corda into raz/os45to46 
 Conflicts:
	Jenkinsfile
 2020-06-12 17:28:40 +01:00
Waldemar Żurowski
4b63bab4fc
Merge pull request #6346 from corda/raz/os44to45 
NOTICK: MERGE OS 4.4 -> OS 4.5
 2020-06-12 17:11:01 +01:00
James Higgs
2c253d806d
EG-2684 Ensure original message is logged with old-style error codes (#6340) 
* [EG-2684] Ensure original message is logged with old-style error codes

* [EG-2684] Address detekt issues
 2020-06-12 16:52:01 +01:00
Christian Sailer
35c661b9f6
Merge pull request #6341 from corda/chrisr3-45-merge 
NOTICK: Merge from OS 4.5 up to ef00fa1.
 2020-06-12 16:42:51 +01:00
Stefano Franz
64f0011a62
Make Checkpoint classes data classes (#6342) 
* Make Checkpoint classes data classes

* tidy up null-checks for array equality
 2020-06-12 16:35:32 +01:00
Schife
b39aaacd3a Merge branch 'release/os/4.4' of https://github.com/corda/corda into raz/os44to45 2020-06-12 15:35:33 +01:00
Razvan Codreanu
2b7c220522
INFRA-387 preallocation and deployNodes migration to Code Checks (#6339) 
* preallocate for slow integration tests as well
 2020-06-12 15:30:15 +01:00
Chris Rankin
3f67e314c0 Merge commit 'ef00fa1388db37e155ab8cfed3763c14801f8aa9' into chrisr3-45-merge 2020-06-12 13:14:44 +01:00
Chris Rankin
ef00fa1388
CORDA-3738: Upgrade to DJVM 1.1. (#6338) 2020-06-12 13:04:09 +01:00
Dan Newton
506b7609a3
Merge pull request #6332 from corda/jamesh/os-4.5-4.6-merge-11062020 
NOTICK OS 4.5 -> OS 4.6 merge 11/06/2020
 2020-06-11 16:49:30 +01:00
James Higgs
6e349f298e
NOTICK - Ignore a potentially dodgy test (#6336) 2020-06-11 16:47:48 +01:00
Joseph Zuniga-Daly
d7e55ed4e5
CORDA-3837: When delivering a lifecycle event, copy the database context into the lifecycle event thread (#6331) 2020-06-11 11:14:51 +01:00
James Higgs
ab023d0b07 Merge branch 'release/os/4.5' into jamesh/os-4.5-4.6-merge-11062020 2020-06-11 09:40:39 +01:00
Ryan Fowler
48ed9dbc6b
NOTICK: Fix IRSDemo code to wait for a response when updating day (#6329) 2020-06-10 18:30:00 +01:00
Razvan Codreanu
1456c358ef
INFRA-242 Adding github action to check PR titles (#6299) 
* INFRA-242 Adding github action to check PR titles

* INFRA-242 rename yml file
 2020-06-10 13:51:37 +01:00
James Higgs
58af87c988
EG-2225 - Create log directory in correct place with verbose flag set (#6321) 
* Ensure logs directory is written to correct location
* Remove a superfluous set of log path property
* Add a unit test to catch bad log paths
* Address detekt issues
 2020-06-10 10:46:57 +01:00
James Higgs
8b7275eb97
EG-2564 - Move printed error to logger (#6323) 2020-06-10 10:45:50 +01:00
André Lopes
c5134d5762
update docker version (#6215) 
corda-zulu-java1.8-4.4
 2020-06-10 08:17:50 +01:00
Christian Sailer
0ac6371e97
Merge pull request #6328 from corda/christians/NOTICK-merge-OS-4.5-4.6 
NOTICK merge removal of example-code
 2020-06-09 21:20:36 +01:00
Christian Sailer
640f83429a Merge commit '550b446' into christians/NOTICK-merge-OS-4.5-4.6 2020-06-09 17:50:05 +01:00
Christian Sailer
550b446b87
NOTICK Remove example code (#6327) 
* Remove example code
 2020-06-09 17:39:51 +01:00
Tamas Veingartner
785715106b
ENT-5379 Reconnecting RPC fixed to recognize shutdown calls and break reconnect attempts (#6316) 2020-06-08 18:03:02 +01:00