Adel El-Beik
|
a7d390038d
|
Merge pull request #7537 from corda/merge-release/os/4.10-release/os/4.11-2023-10-17-7
ENT-10923: Merging forward updates from release/os/4.10 to release/os/4.11 - 2023-10-17
|
2023-10-17 14:07:36 +01:00 |
|
Adel El-Beik
|
664df241e4
|
Merge pull request #7536 from corda/merge-release/os/4.11-release/os/4.12-2023-10-17-16
ENT-10110: Merging forward updates from release/os/4.11 to release/os/4.12 - 2023-10-17
|
2023-10-17 12:18:02 +01:00 |
|
Rick Parker
|
0befdd6ebb
|
Merge branch 'release/os/4.11' into merge-release/os/4.10-release/os/4.11-2023-10-17-7
|
2023-10-17 11:03:02 +01:00 |
|
Rick Parker
|
50400dc5d2
|
Merge pull request #7535 from corda/merge-release/os/4.9-release/os/4.10-2023-10-17-6
ENT-10923: Merging forward updates from release/os/4.9 to release/os/4.10 - 2023-10-17
|
2023-10-17 10:22:19 +01:00 |
|
r3-build
|
5ae5ca95ea
|
Merging forward updates from release/os/4.11 to release/os/4.12 - 2023-10-17
|
2023-10-17 06:05:08 +00:00 |
|
r3-build
|
157b6dba57
|
Merging forward updates from release/os/4.9 to release/os/4.10 - 2023-10-17
|
2023-10-17 06:04:13 +00:00 |
|
Jose Coll
|
6a2bad8077
|
ENT-10110 Back-port changes from ENT + additional clean-up (#7532)
|
2023-10-17 07:03:49 +01:00 |
|
Rick Parker
|
7f66a3f8fb
|
Merge pull request #7534 from corda/merge-release/os/4.8-release/os/4.9-2023-10-16-5
ENT-10923: Merging forward updates from release/os/4.8 to release/os/4.9 - 2023-10-16
|
2023-10-17 07:02:59 +01:00 |
|
r3-build
|
1a3e294f4d
|
Merging forward updates from release/os/4.8 to release/os/4.9 - 2023-10-16
|
2023-10-16 15:08:49 +00:00 |
|
Rick Parker
|
232eb47475
|
Merge pull request #7533 from corda/merge-release/os/4.7-release/os/4.8-2023-10-16-5
ENT-10923: Merging forward updates from release/os/4.7 to release/os/4.8 - 2023-10-16
|
2023-10-16 16:05:21 +01:00 |
|
r3-build
|
3ca2bb0b70
|
Merging forward updates from release/os/4.7 to release/os/4.8 - 2023-10-16
|
2023-10-16 12:29:46 +00:00 |
|
Rick Parker
|
aaf263059e
|
ENT-10923 Change code owners (#7531)
|
2023-10-16 13:28:18 +01:00 |
|
Rick Parker
|
2fa1ff4f93
|
Merge pull request #7529 from corda/merge-release/os/4.11-release/os/4.12-2023-10-10-14
ENT-10110: Merging forward updates from release/os/4.11 to release/os/4.12 - 2023-10-10
|
2023-10-13 11:46:20 +01:00 |
|
Jose Coll
|
1981334921
|
ENT-10110 Clean-up. (#7530)
|
2023-10-13 11:26:07 +01:00 |
|
r3-build
|
d73e100115
|
Merging forward updates from release/os/4.11 to release/os/4.12 - 2023-10-10
|
2023-10-10 16:43:14 +00:00 |
|
Jose Coll
|
a66042ec09
|
ENT-10110 Ledger Recovery database table tweaks (#7528)
|
2023-10-10 17:41:49 +01:00 |
|
Rick Parker
|
0bc5ae1234
|
Merge pull request #7527 from corda/merge-release/os/4.11-release/os/4.12-2023-10-06-13
ENT-10860: Merging forward updates from release/os/4.11 to release/os/4.12 - 2023-10-06
|
2023-10-07 09:47:42 +01:00 |
|
r3-build
|
04efefa506
|
Merging forward updates from release/os/4.11 to release/os/4.12 - 2023-10-06
|
2023-10-06 22:46:55 +00:00 |
|
Adel El-Beik
|
6153990ef5
|
Merge pull request #7526 from corda/merge-release/os/4.10-release/os/4.11-2023-10-06-6
ENT-10860: Merging forward updates from release/os/4.10 to release/os/4.11 - 2023-10-06
|
2023-10-06 23:46:00 +01:00 |
|
r3-build
|
67837523ab
|
Merging forward updates from release/os/4.10 to release/os/4.11 - 2023-10-06
|
2023-10-06 16:44:41 +00:00 |
|
Rick Parker
|
d48f95e1fc
|
Merge pull request #7525 from corda/merge-release/os/4.9-release/os/4.10-2023-10-06-5
ENT-10860: Merging forward updates from release/os/4.9 to release/os/4.10 - 2023-10-06
|
2023-10-06 17:43:25 +01:00 |
|
r3-build
|
de4eda5a35
|
Merging forward updates from release/os/4.9 to release/os/4.10 - 2023-10-06
|
2023-10-06 13:47:28 +00:00 |
|
Rick Parker
|
341ce9fe74
|
Merge pull request #7524 from corda/merge-release/os/4.11-release/os/4.12-2023-10-05-12
ENT-10110: Merging forward updates from release/os/4.11 to release/os/4.12 - 2023-10-05
|
2023-10-06 14:42:57 +01:00 |
|
Rick Parker
|
e3a768495a
|
Merge pull request #7523 from corda/merge-release/os/4.8-release/os/4.9-2023-10-05-4
ENT-10860: Merging forward updates from release/os/4.8 to release/os/4.9 - 2023-10-05
|
2023-10-06 14:42:18 +01:00 |
|
r3-build
|
14c9fe06c7
|
Merging forward updates from release/os/4.11 to release/os/4.12 - 2023-10-05
|
2023-10-05 15:54:20 +00:00 |
|
Jose Coll
|
fdf8d5344b
|
ENT-10110 Ledger Recovery tweaks (#7519)
|
2023-10-05 16:53:20 +01:00 |
|
r3-build
|
1b332bb2e0
|
Merging forward updates from release/os/4.8 to release/os/4.9 - 2023-10-05
|
2023-10-05 14:18:04 +00:00 |
|
Adel El-Beik
|
aa77154601
|
Merge pull request #7522 from corda/merge-release/os/4.7-release/os/4.8-2023-10-05-4
ENT-10860: Merging forward updates from release/os/4.7 to release/os/4.8 - 2023-10-05
|
2023-10-05 15:17:05 +01:00 |
|
r3-build
|
4325131c27
|
Merging forward updates from release/os/4.7 to release/os/4.8 - 2023-10-05
|
2023-10-05 10:17:26 +00:00 |
|
Rick Parker
|
3cdb8901b4
|
Don't bind unless shared memory says it is free (#7520)
|
2023-10-05 11:16:12 +01:00 |
|
Rick Parker
|
7a5c31cadb
|
Merge pull request #7518 from corda/merge-release/os/4.11-release/os/4.12-2023-10-02-10
ENT-10110: Merging forward updates from release/os/4.11 to release/os/4.12 - 2023-10-02
|
2023-10-04 09:29:45 +01:00 |
|
r3-build
|
ac9b10ef81
|
Merging forward updates from release/os/4.11 to release/os/4.12 - 2023-10-02
|
2023-10-02 16:29:56 +00:00 |
|
Jose Coll
|
b15ca0f394
|
ENT-10110 LedgerRecovery parameters + flow return type change. (#7516)
|
2023-10-02 17:29:48 +01:00 |
|
Jose Coll
|
4e355b953b
|
ENT-10110 timeDiscriminator must also be shared for DR synchronisation. (#7517)
|
2023-10-02 17:28:44 +01:00 |
|
Rick Parker
|
beefe1b417
|
Merge pull request #7515 from corda/merge-release/os/4.11-release/os/4.12-2023-09-29-9
ENT-9943: Merging forward updates from release/os/4.11 to release/os/4.12 - 2023-09-29
|
2023-10-02 09:25:59 +01:00 |
|
r3-build
|
5e98eb522d
|
Merging forward updates from release/os/4.11 to release/os/4.12 - 2023-09-29
|
2023-09-29 15:55:49 +00:00 |
|
Adel El-Beik
|
a6254d54e3
|
Merge pull request #7514 from corda/adel/ENT-9943-v2
ENT-9943: Missed test that had assumed party id was still a long, now…
|
2023-09-29 16:54:45 +01:00 |
|
Adel El-Beik
|
b7e484c3d8
|
ENT-9943: Missed test that had assumed party id was still a long, now updated to string.
|
2023-09-29 16:14:10 +01:00 |
|
Rick Parker
|
0de6165606
|
Merge pull request #7513 from corda/merge-release/os/4.11-release/os/4.12-2023-09-29-8
ENT-9943: Merging forward updates from release/os/4.11 to release/os/4.12 - 2023-09-29
|
2023-09-29 11:45:39 +01:00 |
|
r3-build
|
ffa07711e8
|
Merging forward updates from release/os/4.11 to release/os/4.12 - 2023-09-29
|
2023-09-29 08:04:04 +00:00 |
|
Adel El-Beik
|
3a23f60199
|
ENT-9943: Now use SecureHash to represent CordaX500Name in distributi… (#7501)
|
2023-09-29 09:03:00 +01:00 |
|
Rick Parker
|
5034575e80
|
Merge pull request #7512 from corda/merge-release/os/4.11-release/os/4.12-2023-09-28-7
ENT-10803: Merging forward updates from release/os/4.11 to release/os/4.12 - 2023-09-28
|
2023-09-29 09:00:04 +01:00 |
|
r3-build
|
d2350b6a5e
|
Merging forward updates from release/os/4.11 to release/os/4.12 - 2023-09-28
|
2023-09-28 11:58:26 +00:00 |
|
Adel El-Beik
|
aec91c450e
|
Merge pull request #7511 from corda/merge-release/os/4.10-release/os/4.11-2023-09-28-4
ENT-10803: Merging forward updates from release/os/4.10 to release/os/4.11 - 2023-09-28
|
2023-09-28 12:57:20 +01:00 |
|
r3-build
|
1055ae2b38
|
Merging forward updates from release/os/4.10 to release/os/4.11 - 2023-09-28
|
2023-09-28 08:37:54 +00:00 |
|
Chris Cochrane
|
d1fae19c26
|
ENT-10803 - Upgraded Jetty (#7506)
|
2023-09-28 09:37:00 +01:00 |
|
Rick Parker
|
1fc4c11361
|
Merge pull request #7509 from corda/merge-release/os/4.9-release/os/4.10-2023-09-27-4
ENT-10806: Merging forward updates from release/os/4.9 to release/os/4.10 - 2023-09-27
|
2023-09-28 09:36:30 +01:00 |
|
Rick Parker
|
02a50ef8f9
|
Merge pull request #7510 from corda/merge-release/os/4.11-release/os/4.12-2023-09-27-5
ENT-10607: Merging forward updates from release/os/4.11 to release/os/4.12 - 2023-09-27
|
2023-09-28 08:57:36 +01:00 |
|
Adel El-Beik
|
ab7bba8846
|
Merge pull request #7508 from corda/cc/dev/os/4.11/security_vulns
ENT-10802 - Security issues
|
2023-09-27 18:51:20 +01:00 |
|
r3-build
|
19346cb0ed
|
Merging forward updates from release/os/4.11 to release/os/4.12 - 2023-09-27
|
2023-09-27 13:03:06 +00:00 |
|