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
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
3d8636c716
updated for new branch
2023-09-01 14:55:04 +02:00
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
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
267b500c93
updated forward merged to new branch
2023-09-01 11:56:24 +02:00
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
b0f86e26f9
ES-412: added automatic forward merge for Corda 4 ( #7469 )
...
* uses an already existing shared pipeline
* will start automatic PR creation for changes between 4.6 and 4.7
2023-09-01 10:50:47 +01:00
134ff60af8
ENT-10694: Switch the noisy SSL handshake to trace logging. But allow it to be enabled again with a system property.
2023-08-31 18:33:34 +01:00
0bcda08180
Merge pull request #7466 from corda/wzur-r3/INFRA-1804/merge/release/os/4.8/with/release/os/4.9/2023-08-30
...
INFRA-1804: Merging forward updates from release/os/4.8 to release/os/4.9
2023-08-31 09:20:19 +01:00
d1a36d296b
INFRA-1804: Merging forward updates from release/os/4.8 to release/os/4.9
2023-08-30 19:45:47 +01:00
266bb4fa2f
Merge pull request #7465 from corda/wzur-r3/INFRA-1804/merge/release/os/4.7/with/release/os/4.8/2023-08-30
...
INFRA-1804: Merging forward updates from release/os/4.7 to release/os/4.8
2023-08-30 19:23:38 +01:00
849f8666a6
INFRA-1804: Merging forward updates from release/os/4.7 to release/os/4.8
2023-08-30 16:40:20 +01:00
672798c187
Merge pull request #7464 from corda/wzur-r3/INFRA-1804/merge/release/os/4.6/with/release/os/4.7/2023-08-30
...
INFRA-1804: Merging forward updates from release/os/4.6 to release/os/4.7
2023-08-30 16:24:50 +01:00
5daa091fdc
INFRA-1804: Merging forward updates from release/os/4.6 to release/os/4.7
2023-08-30 14:30:31 +01:00
00b1f3d2c7
INFRA-1804: revert back to standard agent ( #7463 )
...
* Snyk binaries have been already incorporated into standard Jenkins
agent
2023-08-30 15:28:29 +02:00
a104923cd6
ENT-10606: fix shell artifact resolution ( #7458 )
2023-08-24 16:44:35 +01:00
66a49ea4cd
Reverted changes to lib/quasar.jar from the previous commit ( #7454 )
2023-08-22 13:38:16 +01:00
a60ed8e479
ES-1140: use java 8u382 in base image
2023-08-22 13:06:23 +01:00
c813533191
Merge pull request #7450 from corda/shams-4.9-merge-5cdbec9d
...
ENT-6876: 4.8 to 4.9 forward merge
2023-08-22 11:11:38 +01:00
fb303a20bf
Merge branch 'release/os/4.8' into shams-4.9-merge-5cdbec9d
...
# Conflicts:
# node/src/main/kotlin/net/corda/node/services/vault/NodeVaultService.kt
2023-08-21 14:18:09 +01:00
5cdbec9ddf
ENT-6876: Optimised vault query to not query for total state count if the first page isn't full ( #7449 )
2023-08-21 10:30:42 +01:00
f0cdc6a25e
Merge pull request #7439 from corda/shams-externalid-multiple-keys-bug
...
ENT-10045: Fix vault query bug when same externalId is mapped to multiple keys
2023-08-01 10:15:56 +01:00
4b7e2a3995
ENT-10045: Fix vault query bug on externalId and mapping with multiple keys
2023-07-26 12:46:27 +01:00
c7296c0deb
Merge pull request #7433 from corda/wzur-r3/ES-839/merge/release/os/4.8/with/release/os/4.9/2023-07-17
...
ES-839: Merging forward updates from release/os/4.8 to release/os/4.9 (2023-07-17)
2023-07-18 08:33:33 +01:00
e23efb0b2d
ES-839: Merging forward updates from release/os/4.8 to release/os/4.9 (2023-07-17)
2023-07-17 22:57:24 +01:00
6a22494431
Merge pull request #7432 from corda/wzur-r3/ES-839/merge/release/os/4.7/with/release/os/4.8/2023-07-17
...
ES-839: Merging forward updates from release/os/4.7 to release/os/4.8 (2023-07-17)
2023-07-17 22:50:56 +01:00
