Adel El-Beik
|
763d1fa706
|
Merge pull request #7372 from corda/shams-vault-query-tx-order
ENT-8827: The ordering of vault query results is clobbered by ServiceHub.loadStates
|
2023-05-27 10:43:01 +01:00 |
|
Shams Asari
|
c065021328
|
ENT-8827: The ordering of vault query results is clobbered by ServiceHub.loadStates
|
2023-05-18 15:59:25 +01:00 |
|
Adel El-Beik
|
79c16f2df1
|
Merge pull request #7371 from corda/cc/os/4.9/ENT-9962/upgrade_sshd_compile_dependency
ENT-9962 - update compile-time dependency
|
2023-05-18 14:18:37 +01:00 |
|
Chris Cochrane
|
6e06630980
|
Upgraded sshd-common compile-time dependency
|
2023-05-18 11:25:46 +01:00 |
|
Shams Asari
|
0cc3ffe1d6
|
ENT-9941: Moved new connector factory to node-api (#7369)
|
2023-05-16 08:45:01 +01:00 |
|
Shams Asari
|
0a617097be
|
ENT-9806: Prevent Netty threads being blocked due to unresponsive CRL endpoints
|
2023-05-15 12:59:24 +01:00 |
|
Adel El-Beik
|
7b7e38476a
|
Merge pull request #7368 from corda/shams-fix-connector-location
ENT-9941: Moved new connector factory to node-api
|
2023-05-12 21:23:09 +01:00 |
|
Shams Asari
|
13ca00deea
|
ENT-9941: Moved new connector factory to node-api
|
2023-05-12 17:42:27 +01:00 |
|
Adel El-Beik
|
71a99c861a
|
Merge pull request #7366 from corda/shams-4.9-frwd-merge-31a34e5a
ENT-6515, ENT-9941: Forward merge 4.8 to 4.9
|
2023-05-12 16:53:19 +01:00 |
|
Shams Asari
|
151dc16a0e
|
Merge branch 'release/os/4.8' into shams-4.9-frwd-merge-31a34e5a
# Conflicts:
# node-api/src/main/kotlin/net/corda/nodeapi/internal/ArtemisTcpTransport.kt
# node/src/main/kotlin/net/corda/node/services/messaging/NodeNettyAcceptorFactory.kt
# node/src/main/kotlin/net/corda/node/services/messaging/P2PMessagingClient.kt
|
2023-05-12 14:34:33 +01:00 |
|
Shams Asari
|
31a34e5a5c
|
ENT-9941: Improved Netty logging, especially of the embedded broker (#7365)
|
2023-05-12 10:11:09 +01:00 |
|
Shams Asari
|
0951853207
|
ENT-6515: Cherry-pick of ENT-6315 - Allow dumping of paused flows (#7008) (#7363)
This is a cherry-pick of https://github.com/corda/corda/pull/7008, which also resolves ENT-6515
Co-authored-by: Dan Newton <dan.newton@r3.com>
|
2023-05-11 09:49:40 +01:00 |
|
Adel El-Beik
|
1d0dccfc5f
|
Merge pull request #7359 from corda/adel/ENT-9883-OS4.9
ENT-9883: Updated CODEOWNERS file.
|
2023-05-04 15:28:55 +01:00 |
|
Adel El-Beik
|
832af0d09e
|
Merge pull request #7356 from corda/adel/ENT-9883-OS4.6
ENT-9883: Updated CODEOWNERS file.
|
2023-05-02 17:33:55 +01:00 |
|
Adel El-Beik
|
657aa64988
|
Merge pull request #7357 from corda/adel/ENT-9883-OS4.7
ENT-9883: Updated CODEOWNERS file.
|
2023-05-02 17:33:21 +01:00 |
|
Adel El-Beik
|
50ef6b7e9a
|
Merge pull request #7358 from corda/adel/ENT-9883-OS4.8
ENT-9883: Updated CODEOWNERS file.
|
2023-05-02 17:32:29 +01:00 |
|
Adel El-Beik
|
3d9c682ce8
|
ENT-9883: Updated CODEOWNERS file.
|
2023-05-02 11:34:37 +01:00 |
|
Adel El-Beik
|
efb901dcb4
|
ENT-9883: Updated CODEOWNERS file.
|
2023-05-02 11:31:55 +01:00 |
|
Adel El-Beik
|
708fe93039
|
ENT-9883: Updated CODEOWNERS file.
|
2023-05-02 11:30:24 +01:00 |
|
Adel El-Beik
|
ee50313260
|
ENT-9883: Updated CODEOWNERS file.
|
2023-05-02 11:24:39 +01:00 |
|
Adel El-Beik
|
9975ddcdd9
|
Merge pull request #7353 from corda/cc/merge/os-4.8-os-4.9/26-apr-2023
ENT-6336,ENT-6960,ENT-8917,ENT-9019,ENT-9096,ENT-7033 - dependency updates
|
2023-04-27 09:19:05 +01:00 |
|
Chris Cochrane
|
c61ea7de81
|
Fixed bracketing issue after merge
|
2023-04-27 02:44:30 +01:00 |
|
Chris Cochrane
|
34d4a5f667
|
Fwd-merge from OS 4.8
|
2023-04-26 22:54:20 +01:00 |
|
Rick Parker
|
f87d7521dc
|
Merge pull request #7352 from corda/cc/merge/os-4.7-os-4.8/25-apr-2023
ENT-6336,ENT-6960,ENT-8917,ENT-9019,ENT-9096,ENT-7033 - dependency updates
|
2023-04-26 08:53:52 +01:00 |
|
Chris Cochrane
|
e12ab8194f
|
Merge branch 'release/os/4.7' into cc/merge/os-4.7-os-4.8/25-apr-2023
Fwd-merge from OS 4.7.
|
2023-04-25 14:54:21 +01:00 |
|
Rick Parker
|
097011784b
|
Merge pull request #7350 from corda/cc/merge/os-4.6-os-4.7/24-apr-2023
ENT-6336,ENT-6960,ENT-8917,ENT-9019,ENT-9096,ENT-7033 - dependency updates
|
2023-04-25 08:49:36 +01:00 |
|
Chris Cochrane
|
91c38fa84b
|
Merge branch 'release/os/4.6' into cc/merge/os-4.6-os-4.7/24-apr-2023
Fwd-merge from OS 4.6.
|
2023-04-24 20:13:50 +01:00 |
|
Adel El-Beik
|
58366caa3d
|
Merge pull request #7340 from corda/cc/merge/os-4.5-os-4.6/20-apr-2023
ENT-6336,ENT-6960,ENT-8917,ENT-9019,ENT-9096,ENT-7033 - dependency updates
|
2023-04-24 14:57:34 +01:00 |
|
Ronan Browne
|
82018bc7eb
|
Merge pull request #7341 from corda/ronanb/merge-4.8-4.9-2023-04-21
INFRA-2040: Merging forward updates from 4.8 to 4.9
|
2023-04-21 16:38:40 +01:00 |
|
Chris Cochrane
|
e5a6cac9e8
|
Flakey test fix
|
2023-04-21 16:00:19 +01:00 |
|
Ronan Browne
|
5db96e679c
|
use correct agent
|
2023-04-21 08:43:29 +01:00 |
|
Ronan Browne
|
269b196c57
|
INFRA-2040: Merging forward updates from 4.8 to 4.9 (2023-04-21)
|
2023-04-21 08:42:42 +01:00 |
|
Chris Cochrane
|
fc758ab766
|
Update build.gradle
Co-authored-by: Viktor Kolomeyko <viktor.kolomeyko@r3.com>
|
2023-04-20 17:14:23 +01:00 |
|
Chris Cochrane
|
c58c49d27a
|
Upgrade corda/crash, snakeyaml
|
2023-04-20 14:01:20 +01:00 |
|
Adel El-Beik
|
845a72cf5b
|
Merge pull request #7337 from corda/cc/os/4.5/ent-7033/upgrade_shiro
ENT-7033 - upgrade shiro
|
2023-04-20 10:10:40 +01:00 |
|
Chris Cochrane
|
641a47bf32
|
Upgraded shiro to address security issues
|
2023-04-20 07:37:00 +01:00 |
|
Adel El-Beik
|
f906bfc14b
|
Merge pull request #7335 from corda/cc/os/4.5/security_vulnerabilities
ENT-6336,ENT-6960,ENT-8917,ENT-9019,ENT-9096 - dependency updates
|
2023-04-19 15:35:17 +01:00 |
|
Chris Cochrane
|
c263ba7563
|
Updated to fix Jackson tests
|
2023-04-19 13:06:35 +01:00 |
|
Ronan Browne
|
b6fbef5463
|
Merge pull request #7334 from corda/ronanb/merge-4.7-4.8-2023-04-18
INFRA-2040: Merging forward updates from 4.7 to 4.8
|
2023-04-19 09:11:34 +01:00 |
|
Chris Cochrane
|
29dfda3730
|
Resolved build-check issues
|
2023-04-18 20:34:42 +01:00 |
|
Chris Cochrane
|
dfbfda5520
|
Upgrade corda/crash
|
2023-04-18 19:30:22 +01:00 |
|
Ronan Browne
|
90cecf69e5
|
INFRA-2040: Merging forward updates from 4.7 to 4.8 (2023-04-18)
|
2023-04-18 19:20:47 +01:00 |
|
Ronan Browne
|
2ffe2eafcb
|
Merge pull request #7333 from corda/ronanb/merge-4.6-4.7-2023-04-17
INFRA-2040: Merging forward updates from 4.6 to 4.7 2023-04-17
|
2023-04-18 17:11:24 +01:00 |
|
Ronan Browne
|
1e7a515a8a
|
INFRA-2040: Merging forward updates from 4.6 to 4.7
|
2023-04-17 17:26:39 +01:00 |
|
Ronan Browne
|
f189fad14a
|
Merge pull request #7331 from corda/ronanb/merge-4.5-4.6-2023-04-16
* INFRA-1955: Shared lib implicit import syntax
* INFRA-2040: remove lingering nexus code (#7330)
|
2023-04-17 17:22:53 +01:00 |
|
Ronan Browne
|
5e9dee18b1
|
INFRA-2040: Merging forward updates from 4.5 to 4.6 (2023-04-16)
|
2023-04-16 18:23:22 +01:00 |
|
Ronan Browne
|
2e9f62f4da
|
INFRA-2040: remove lingering nexus code (#7330)
|
2023-04-16 18:19:43 +01:00 |
|
Rick Parker
|
ceb76c56de
|
Merge pull request #7325 from corda/shams-4.9-fwrd-merge-d140cb59
ENT-8898 & ENT-9569: Forward merge from 4.8 to 4.9 (4cedeb7)
|
2023-04-12 15:30:55 +01:00 |
|
Shams Asari
|
40697d5450
|
Merge branch 'release/os/4.8' into shams-4.9-fwrd-merge-d140cb59
|
2023-04-12 10:46:00 +01:00 |
|
Adel El-Beik
|
4cedeb7b9e
|
Merge pull request #7326 from corda/shams-revert-quasar-jar
ENT-9569: Revert lib/quasar.jar
|
2023-04-12 09:47:40 +01:00 |
|