Jose Coll
|
97d8549d4f
|
ENT-9927 Ledger Recovery tweaks. (#7407)
|
2023-07-03 10:02:34 +01:00 |
|
Jose Coll
|
49d5b6a4bf
|
ENT-4973 Introduce explicit constructors to evolve ReceiveFinalityFlow for binary backwards compatibility (#7404)
* Introduce explicit constructors to evolve ReceiveFinalityFlow for binary backwards compatibility.
|
2023-06-29 11:19:59 +01:00 |
|
Rick Parker
|
59404fbdfc
|
Merge pull request #7399 from corda/adel/merge-from-os4.10-23jun-23
ENT-9962, ES-562: Merge from OS 4.10
|
2023-06-26 14:16:25 +01:00 |
|
Adel El-Beik
|
602190095c
|
Merge remote-tracking branch 'origin/release/os/4.10' into adel/merge-from-os4.10-23jun-23
|
2023-06-23 11:39:02 +01:00 |
|
Jose Coll
|
0e877958fe
|
ENT-10009 Enhance SendTransactionFlow to allow sending a txn to multiple sessions. (#7393)
|
2023-06-09 17:19:43 +01:00 |
|
Connel McGovern
|
41e9298b19
|
ES-562: Updating modules to scan on Snyk nightly (#7392)
|
2023-06-07 13:49:40 +01:00 |
|
Connel McGovern
|
25e7d2fdfd
|
ES-562: Updating .snyk YAML expiry & updating modules to scan on Snyk nightly (#7391)
* ES-562: Updating .snyk YAML expiry & updating modules to scan on Snyk nightly
|
2023-06-07 09:58:41 +01:00 |
|
Jose Coll
|
c56ee1cc73
|
Fix failing slow test. (#7387)
|
2023-06-07 09:30:24 +01:00 |
|
Adel El-Beik
|
2cdd931fcf
|
Merge pull request #7384 from corda/shams-vault-page-stream
ENT-9793: Use streams when loading vault query pages
|
2023-06-06 15:30:51 +01:00 |
|
Shams Asari
|
ff0693a598
|
ENT-9793: Use streams when loading vault query pages
|
2023-06-06 13:13:22 +01:00 |
|
nargas-ritu
|
5510cb151b
|
Merge pull request #7375 from corda/shams-vault-page-overlap
ENT-9793: Added Page.previousPageAnchor to allow detection of vault changes whilst pages are loaded
|
2023-06-06 11:07:45 +01:00 |
|
Jose Coll
|
f791adf442
|
ENT-9924 (Follow-up) Update recording of transaction flow recovery metadata into Send/Receive transaction flows. (#7382)
|
2023-06-05 16:59:06 +01:00 |
|
Jose Coll
|
2c775bcc41
|
ENT-9924 Update recording of transaction flow recovery metadata into Send/Receive transaction flows. (#7374)
|
2023-06-02 16:05:28 +01:00 |
|
Adel El-Beik
|
e60f30c28d
|
Merge pull request #7378 from corda/adel/merge-from-4.9
NOTICK: Merge from OS 4.9
|
2023-05-31 17:20:08 +01:00 |
|
Adel El-Beik
|
d37df1572e
|
Merge remote-tracking branch 'origin/release/os/4.9' into adel/merge-from-4.9
|
2023-05-31 12:27:41 +01:00 |
|
Adel El-Beik
|
ac4255ca75
|
Merge pull request #7377 from corda/ritu_tmp_4.9.7-waivers
ENT-9108: Corda OS 4.9.7 remaining waivers
|
2023-05-31 09:59:08 +01:00 |
|
nargas-ritu
|
c64ad75ee3
|
ENT-9108: Corda OS 4.9.7 remaining waivers
|
2023-05-30 19:08:43 +01:00 |
|
nargas-ritu
|
20a155f260
|
Merge pull request #7376 from corda/ritu_tmp_4.9.7-waivers
ENT-9108: Corda OS 4.9.7 waivers
|
2023-05-30 15:52:52 +01:00 |
|
nargas-ritu
|
9af77719d0
|
NOTICK: Corda OS 4.9.7 waivers
|
2023-05-30 11:54:05 +01:00 |
|
Shams Asari
|
ed08b2c5de
|
ENT-9793: Added Page.previousPageAnchor to allow detection of vault changes whilst pages are loaded
|
2023-05-26 12:52:06 +01:00 |
|
Jose Coll
|
2e29e36e01
|
ENT-9923 Ledger Recovery: split out recovery metadata into own database schema. (#7364)
|
2023-05-24 09:42:09 +01:00 |
|
Rick Parker
|
c7e21b3a65
|
Merge pull request #7373 from corda/shams-4.11-fwrd-merge-046ed0ac
ENT-6515, ENT-9941: 4.10 to 4.11 forward merge
|
2023-05-22 17:34:41 +01:00 |
|
Shams Asari
|
9ebcfd3176
|
Merge fix
|
2023-05-22 10:00:03 +01:00 |
|
Shams Asari
|
e6336666c2
|
Merge branch 'release/os/4.10' into shams-4.11-fwrd-merge-046ed0ac
# Conflicts:
# node-api/src/main/kotlin/net/corda/nodeapi/internal/crypto/X509Utilities.kt
|
2023-05-22 09:55:19 +01:00 |
|
Rick Parker
|
046ed0ac3b
|
Merge pull request #7370 from corda/shams-4.10-fwrd-merge-7b7e3847
ENT-6515, ENT-9941: 4.9 to 4.10 forward merge
|
2023-05-19 19:07:56 +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
|
a37d09486f
|
Merge branch 'release/os/4.9' into shams-4.10-fwrd-merge-7b7e3847
|
2023-05-15 09:55:31 +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
|
3617048e75
|
Merge pull request #7362 from corda/cc/merge/os-4.10-os-4.11/03-may-2023
ENT-6336,ENT-6960,ENT-8917,ENT-9019,ENT-9096,ENT-7033 - dependency updates
|
2023-05-04 15:28:11 +01:00 |
|
Chris Cochrane
|
cca09fef58
|
Merge branch 'release/os/4.10' into cc/merge/os-4.10-os-4.11/03-may-2023
Fwd-merge from OS 4.11.
|
2023-05-03 17:47:44 +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
|
00cdc3f7be
|
Merge pull request #7360 from corda/adel/ENT-9883-OS4.10
ENT-9883: Updated CODEOWNERS file.
|
2023-05-02 17:31:27 +01:00 |
|
Adel El-Beik
|
a9d6da88ff
|
Merge pull request #7361 from corda/adel/ENT-9883-OS4.11
ENT-9883: Updated CODEOWNERS file.
|
2023-05-02 17:30:54 +01:00 |
|
Adel El-Beik
|
a731996844
|
ENT-9883: Updated CODEOWNERS file.
|
2023-05-02 11:37:58 +01:00 |
|
Adel El-Beik
|
335daabd28
|
ENT-9883: Updated CODEOWNERS file.
|
2023-05-02 11:35:58 +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
|
35a2b3d48b
|
Merge pull request #7354 from corda/cc/merge/os-4.9-os-4.10/27-apr-2023
ENT-6336,ENT-6960,ENT-8917,ENT-9019,ENT-9096,ENT-7033 - dependency updates
|
2023-04-28 10:00:49 +01:00 |
|
Chris Cochrane
|
0ba1cef49d
|
Bumped up Jackson; removed unwanted gradle task
|
2023-04-27 17:00:08 +01:00 |
|
Jose Coll
|
c3e39a7052
|
ENT-9842 Re-factor 2PF to support issuance transactions (no notarisation) with observers. (#7349)
Re-factor 2PF to support issuance transactions (no notarisation) with observers.
|
2023-04-27 16:58:17 +01:00 |
|
Chris Cochrane
|
2f53e8115f
|
Fwd-merge from OS 4.9
|
2023-04-27 16:45:16 +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 |
|