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
Waldemar Zurowski
9f395b5ec3
ES-1313: Merging forward updates from release/os/4.9 to release/os/4.10
...
Conflicts:
* .ci/dev/forward-merge/Jenkinsfile
2023-09-07 20:36:14 +01:00
Waldemar Żurowski
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
Waldemar Zurowski
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
Waldemar Żurowski
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
Waldemar Zurowski
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
Waldemar Żurowski
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
Waldemar Zurowski
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
Waldemar Żurowski
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
Waldemar Żurowski
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
Waldemar Zurowski
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
Ronan Browne
8e2115293a
ES-1313: Update Jenkinsfile for slack channel ( #7484 )
2023-09-07 11:49:33 +02:00
Adel El-Beik
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
Rick Parker
694b011492
Merge pull request #7478 from corda/merge-release/os/4.9-release/os/4.10-2023-09-01-1
...
ES-412 Merging release/os/4.9 to release/os/4.10
2023-09-04 11:20:31 +01:00
Waldemar Żurowski
8a01b25684
updated forward merger for current branch
...
* updated originBranch to match current branch
* updated targetBranch to match branch with the next version
19:11
2023-09-01 22:50:29 +02:00
r3-build
612cfcdb32
Merging forward updates from release/os/4.9 to release/os/4.10 - 2023-09-01
2023-09-01 20:47:47 +00:00
Waldemar Żurowski
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
Waldemar Żurowski
3a093ef324
updated forward merged to new branch
2023-09-01 18:25:46 +02:00
r3-build
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
Waldemar Żurowski
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
Adel El-Beik
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
Adel El-Beik
fb7e7057de
Merge pull request #7471 from corda/adel/ENT-10694-os
...
ENT-10694: Switch the noisy SSL handshake to trace logging. But allow…
2023-09-01 14:39:50 +01:00
Waldemar Żurowski
3d8636c716
updated for new branch
2023-09-01 14:55:04 +02:00
r3-build
fe9483d331
Merging forward updates from release/os/4.7 to release/os/4.8 - 2023-09-01
2023-09-01 12:47:45 +00:00
Waldemar Żurowski
863ea10934
Merge pull request #7472 from corda/merge-release/os/4.6-release/os/4.7-2023-09-01-1
...
ES-412 Merging release/os/4.6 to release/os/4.7
2023-09-01 13:46:42 +01:00
Waldemar Żurowski
267b500c93
updated forward merged to new branch
2023-09-01 11:56:24 +02:00
r3-build
8349675a23
Merging forward updates from release/os/4.6 to release/os/4.7 - 2023-09-01
2023-09-01 09:51:40 +00:00
