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
Adel El-Beik
238608224b
ENT-10607: Reduced length of distribution records table name to under… ( #7505 )
...
* ENT-10607: Reduced length of distribution records table name to under 30 chars for Oracle.
* ENT-10607: Need to update the entity classes as well.
2023-09-27 14:01:44 +01:00
Chris Cochrane
40539c341b
Merge branch 'release/os/4.10' into merge-release/os/4.9-release/os/4.10-2023-09-27-4
2023-09-27 12:22:00 +01:00
Chris Cochrane
6735e4bf36
ENT-10806 - Bumped jetty version ( #7504 )
2023-09-27 11:43:14 +01:00
Chris Cochrane
3b24302045
Bumped Jetty version
2023-09-27 11:27:58 +01:00
Rick Parker
0dd46dd258
Merge pull request #7503 from corda/merge-release/os/4.11-release/os/4.12-2023-09-26-4
...
ENT-10811: Merging forward updates from release/os/4.11 to release/os/4.12 - 2023-09-26
2023-09-26 12:56:47 +01:00
r3-build
7c580a8e9e
Merging forward updates from release/os/4.11 to release/os/4.12 - 2023-09-26
2023-09-26 10:05:14 +00:00
Adel El-Beik
2ce63b20a2
Merge pull request #7500 from corda/shams-aes-table-remove-primary-key-index
...
ENT-10811: Removed index on primary key in node_aes_encryption_keys table
2023-09-26 11:00:35 +01:00
Shams Asari
ea4bcd5369
ENT-10811: Removed index on primary key column in node_aes_encryption_keys table
...
The index is redundant on the primary key, and causes an issue in the schema migration for some databases, such as Oracle.
2023-09-22 15:09:33 +01:00
Rick Parker
3b551c5344
Merge pull request #7499 from corda/merge-release/os/4.11-release/os/4.12-2023-09-21-3
...
ENT-10700: Merging forward updates from release/os/4.11 to release/os/4.12 - 2023-09-21
2023-09-22 10:35:00 +01:00
r3-build
7fae4e1b26
Merging forward updates from release/os/4.11 to release/os/4.12 - 2023-09-21
2023-09-21 16:23:31 +00:00
Balwant Kothari
6243088ebb
ENT-10700 Updating timeWindow to nullable ( #7498 )
...
* ENT-10700 Updating timeWindow to nullable
2023-09-21 17:22:27 +01:00
Rick Parker
ab5cb8b743
Merge pull request #7497 from corda/merge-release/os/4.11-release/os/4.12-2023-09-20-2
...
ENT-6875: Merging forward updates from release/os/4.11 to release/os/4.12 - 2023-09-20
2023-09-20 11:11:06 +01:00
r3-build
9577d179a5
Merging forward updates from release/os/4.11 to release/os/4.12 - 2023-09-20
2023-09-20 07:46:11 +00:00
Jose Coll
b16c93e76b
ENT-6875 Deserialisation exception on output state can cause ledger inconsistency ( #7476 )
2023-09-20 08:44:56 +01:00
Ronan Browne
b2eba94d02
ES-1351: bump platformVersion for new release branch ( #7496 )
2023-09-15 21:03:13 +01:00
Ronan Browne
1fdc23692a
ES-1351: set up 4.12 branch
2023-09-14 11:13:15 +01:00
Rick Parker
a90e0b4cfb
Merge pull request #7495 from corda/merge-release/os/4.10-release/os/4.11-2023-09-08-3
...
ENT-10756 Merging release/os/4.10 to release/os/4.11
2023-09-11 09:41:54 +01:00
r3-build
13e32ae978
Merging forward updates from release/os/4.10 to release/os/4.11 - 2023-09-08
2023-09-08 16:48:35 +00:00
Waldemar Żurowski
26269b5106
Merge pull request #7494 from corda/merge-release/os/4.9-release/os/4.10-2023-09-08-3
...
ENT-10756 Merging release/os/4.9 to release/os/4.10
2023-09-08 17:47:32 +01:00
Waldemar Żurowski
f66c270fc6
Merge pull request #7491 from corda/wzur-r3/ES-1313/merge/release/os/4.10/with/release/os/4.11/2023-09-08
...
ES-1313: Merging forward updates from release/os/4.10 to release/os/4.11
2023-09-08 16:37:18 +01:00
r3-build
17f5cd5524
Merging forward updates from release/os/4.9 to release/os/4.10 - 2023-09-08
2023-09-08 14:56:56 +00:00
Shams Asari
fb4247d5c9
ENT-10756: Use normal select count query for totalStatesAvailable ( #7492 )
...
Some DBs do not like the use of `distinct` in the count query for the `Page.totalStatesAvailable` result. It turns out it's not needed anyway and a non-distinct select count works as well.
2023-09-08 15:55:23 +01:00
Waldemar Zurowski
7175d56f6c
ES-1313: Merging forward updates from release/os/4.10 to release/os/4.11
...
Conflicts:
* .ci/dev/forward-merge/Jenkinsfile
2023-09-08 09:09:58 +01:00
