Adel El-Beik
5569cd37be
Merge pull request #7619 from corda/merge-release/os/4.9-release/os/4.10-2023-12-15-37
...
ENT-11118: Merging forward updates from release/os/4.9 to release/os/4.10 - 2023-12-15
2023-12-16 19:15:09 +00:00
r3-build
1cf66d4a8f
Merging forward updates from release/os/4.9 to release/os/4.10 - 2023-12-15
2023-12-15 20:02:41 +00:00
Adel El-Beik
2208d56337
Merge pull request #7618 from corda/tom/ENT-11118/netty-ssl-handshake-fix
...
ENT-11118: Netty SSL handshake fix (#5028 )
2023-12-15 19:59:39 +00:00
Tom Stark
71e187dddb
ENT-11118: Netty SSL handshake fix ( #5028 )
...
* ENT-11118: Added fix for netty SSL handshake fail
2023-12-15 17:16:15 +00:00
Ronan Browne
87a47c4ee5
Merge pull request #7615 from corda/merge-release/os/4.9-release/os/4.10-2023-12-14-35
...
ENT-11281: Merging forward updates from release/os/4.9 to release/os/4.10 - 2023-12-14
2023-12-15 11:40:05 +00:00
r3-build
27759ea74f
Merging forward updates from release/os/4.9 to release/os/4.10 - 2023-12-14
2023-12-14 17:51:03 +00:00
Maciej Swierad
bf6fcb2a8f
Merge pull request #7614 from corda/merge-release/os/4.8-release/os/4.9-2023-12-14-33
...
ENT-11281: Merging forward updates from release/os/4.8 to release/os/4.9 - 2023-12-14
2023-12-14 17:48:48 +00:00
r3-build
40a96c5760
Merging forward updates from release/os/4.8 to release/os/4.9 - 2023-12-14
2023-12-14 17:06:04 +00:00
Maciej Swierad
bbc994882a
Merge pull request #7613 from corda/merge-release/os/4.7-release/os/4.8-2023-12-14-35
...
ENT-11281: Merging forward updates from release/os/4.7 to release/os/4.8 - 2023-12-14
2023-12-14 17:03:24 +00:00
r3-build
0dbdd08984
Merging forward updates from release/os/4.7 to release/os/4.8 - 2023-12-14
2023-12-14 15:30:28 +00:00
Maciej Swierad
97310a8895
ENT-11281/Activating forward merge logic
2023-12-14 14:57:13 +00:00
Ronan Browne
b4a95a63cc
Merge pull request #7587 from corda/merge-release/os/4.9-release/os/4.10-2023-11-22-11
...
ES-1131: Merging forward updates from release/os/4.9 to release/os/4.10 - 2023-11-22
2023-11-24 16:13:22 +00:00
r3-build
04d2373a8a
Merging forward updates from release/os/4.9 to release/os/4.10 - 2023-11-22
2023-11-22 19:21:08 +00:00
Adel El-Beik
8776030a95
Merge pull request #7583 from corda/merge-release/os/4.8-release/os/4.9-2023-11-21-9
...
ES-1131: Merging forward updates from release/os/4.8 to release/os/4.9 - 2023-11-21
2023-11-22 19:20:14 +00:00
r3-build
aa4d2e56fc
Merging forward updates from release/os/4.8 to release/os/4.9 - 2023-11-21
2023-11-21 03:02:05 +00:00
Ronan Browne
171977574e
Merge pull request #7581 from corda/merge-release/os/4.9-release/os/4.10-2023-11-20-8
...
ES-1331: Merging forward updates from release/os/4.9 to release/os/4.10 - 2023-11-20
2023-11-20 21:18:43 +00:00
r3-build
5e9fdb7b2b
Merging forward updates from release/os/4.9 to release/os/4.10 - 2023-11-20
2023-11-20 14:29:12 +00:00
Connel McGovern
8d4eac4977
Merge pull request #7579 from corda/merge-release/os/4.8-release/os/4.9-2023-11-19-6
...
ES-1331: Merging forward updates from release/os/4.8 to release/os/4.9 - 2023-11-19
2023-11-20 14:25:52 +00:00
Adel El-Beik
f8925687a2
Merge pull request #7580 from corda/connelm/ES-1131/re-add-authenticateGradleWrapper
...
ES-1131: Re-add authenticateGradleWrapper
2023-11-20 11:38:01 +00:00
Connel McGovern
7c681e025d
ES-1131: Re-add authenticateGradleWrapper
2023-11-20 11:06:46 +00:00
Connel McGovern
fa899c55c2
ES-1131: Re-add authenticateGradleWrapper
2023-11-20 11:05:54 +00:00
Ronan Browne
18d98760b1
Merge branch 'release/os/4.9' into merge-release/os/4.8-release/os/4.9-2023-11-19-6
2023-11-19 19:56:09 +00:00
Ronan Browne
44bfb2821d
Merge pull request #7578 from corda/merge-release/os/4.7-release/os/4.8-2023-11-17-6
...
ES-1331: Merging forward updates from release/os/4.7 to release/os/4.8 - 2023-11-17
2023-11-19 19:13:06 +00:00
Adel El-Beik
548242e3cd
Merge branch 'release/os/4.8' into merge-release/os/4.7-release/os/4.8-2023-11-17-6
2023-11-18 18:10:07 +00:00
Connel McGovern
5b846406c8
ES-1331: Enable Gradle Enterprise build scans & remote caching ( #7574 )
...
* ES-1131: Enable Gradle Enterprise build scans & remote caching
2023-11-17 17:41:45 +00:00
Adel El-Beik
2ff74c1d1a
Merge pull request #7558 from corda/merge-release/os/4.9-release/os/4.10-2023-11-03-7
...
ENT-10760: Merging forward updates from release/os/4.9 to release/os/4.10 - 2023-11-03
2023-11-03 13:11:58 +00:00
r3-build
a31fd82951
Merging forward updates from release/os/4.9 to release/os/4.10 - 2023-11-03
2023-11-03 10:00:35 +00:00
Adel El-Beik
01a6539111
ENT-10760: Fixed typo in Delete settings. ( #7555 )
2023-11-03 09:58:00 +00: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
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
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
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
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
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
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
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
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
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 Żurowski
c75fac4801
Merge pull request #7490 from corda/wzur-r3/ES-1313/merge/release/os/4.9/with/release/os/4.10/2023-09-07
...
ES-1313: Merging forward updates from release/os/4.9 to release/os/4.10
2023-09-08 07:52:38 +01:00
