764b47ad18
ES-1919/Update-Github-Workflows
2024-03-29 12:09:56 +00:00
fa173baaee
ENT-11387: Fix to prevent interleaved stop/start causing bridge to be started with null session. ( #7665 )
...
* ENT-11387: Fix to prevent interleaved stop/start causing bridge to be started with null session.
* ENT-11387: Fixed bug in assigning null to session.
2024-01-30 09:07:18 +00:00
4793cd5f31
Merge pull request #7644 from corda/cc/dev/4.9/security_vulns
...
ENT-10900 - Security vulnerabilities
2024-01-12 18:29:16 +00:00
07a2d98d0b
Security vulnerabilities
2024-01-12 11:51:12 +00:00
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
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
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
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
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
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
97310a8895
ENT-11281/Activating forward merge logic
2023-12-14 14:57:13 +00:00
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
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
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
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
7c681e025d
ES-1131: Re-add authenticateGradleWrapper
2023-11-20 11:06:46 +00:00
fa899c55c2
ES-1131: Re-add authenticateGradleWrapper
2023-11-20 11:05:54 +00:00
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
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
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
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
01a6539111
ENT-10760: Fixed typo in Delete settings. ( #7555 )
2023-11-03 09:58:00 +00:00
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
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
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
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
aaf263059e
ENT-10923 Change code owners ( #7531 )
2023-10-16 13:28:18 +01:00
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
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
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
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
3cdb8901b4
Don't bind unless shared memory says it is free ( #7520 )
2023-10-05 11:16:12 +01:00
6735e4bf36
ENT-10806 - Bumped jetty version ( #7504 )
2023-09-27 11:43:14 +01:00
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
fad7fcbd11
Merge pull request #7489 from corda/wzur-r3/ES-1313/merge/release/os/4.8/with/release/os/4.9/2023-09-07
...
ES-1313: Merging forward updates from release/os/4.8 to release/os/4.9
2023-09-07 20:30:55 +01:00
a7274c4ec2
ES-1313: Merging forward updates from release/os/4.8 to release/os/4.9
...
Conflicts:
* .ci/dev/forward-merge/Jenkinsfile
2023-09-07 18:30:28 +01:00
8dd436ebc9
Merge pull request #7488 from corda/wzur-r3/ES-1313/merge/release/os/4.7/with/release/os/4.8/2023-09-07
...
ES-1313: Merging forward updates from release/os/4.7 to release/os/4.8
2023-09-07 18:21:55 +01:00
fd55e4c8d4
ES-1313: Merging forward updates from release/os/4.7 to release/os/4.8
...
Conflicts:
* .ci/dev/forward-merge/Jenkinsfile
2023-09-07 16:08:20 +01:00
bae84b3c63
Merge pull request #7487 from corda/wzur-r3/ES-1313/merge/release/os/4.6/with/release/os/4.7/2023-09-07
...
ES-1313: Merging forward updates from release/os/4.6 to release/os/4.7
2023-09-07 16:05:51 +01:00
1c903b0ff2
ES-1313: Merging forward updates from release/os/4.6 to release/os/4.7
...
Conflicts:
* .ci/dev/forward-merge/Jenkinsfile
2023-09-07 14:06:10 +01:00
dfe0ed294e
ES-1313: changes for better future forward merges ( #7486 )
...
* add more comments as a form of documentation
* move variable names away from calling pipeline for better experience
of future forward merges if pipeline parameters were to change
2023-09-07 14:39:02 +02:00
ddcb8adfc0
Merge pull request #7485 from corda/wzur-r3/ES-1313/merge/release/os/4.6/with/release/os/4.7/2023-09-07
...
ES-1313: Merging forward updates from release/os/4.6 to release/os/4.7
2023-09-07 13:34:34 +01:00
658e7217a3
ES-1313: Merging forward updates from release/os/4.6 to release/os/4.7
...
Conflicts:
* .ci/dev/forward-merge/Jenkinsfile
2023-09-07 11:27:57 +01:00
8e2115293a
ES-1313: Update Jenkinsfile for slack channel ( #7484 )
2023-09-07 11:49:33 +02:00
517884a96e
Merge pull request #7474 from corda/adel/ENT-10693-os
...
ENT-10694: Switch the noisy SSL handshake to trace logging. But allow…
2023-09-04 12:47:00 +01:00
8fb5308194
Merge pull request #7477 from corda/merge-release/os/4.8-release/os/4.9-2023-09-01-1
...
ES-412 Merging release/os/4.8 to release/os/4.9
2023-09-01 21:43:39 +01:00
3a093ef324
updated forward merged to new branch
2023-09-01 18:25:46 +02:00
313d342b02
Merging forward updates from release/os/4.8 to release/os/4.9 - 2023-09-01
2023-09-01 16:23:11 +00:00
5ff4b4e8f6
Merge pull request #7473 from corda/merge-release/os/4.7-release/os/4.8-2023-09-01-1
...
ES-412 Merging release/os/4.7 to release/os/4.8
2023-09-01 17:22:13 +01:00
dc51f10832
ENT-10694: Switch the noisy SSL handshake to trace logging. But allow it to be enabled again with a system property.
2023-09-01 14:48:56 +01:00
