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 |
|
Rick Parker
|
5d84d0a5c9
|
ENT-10306 Missed actually verifying transaction from recent refactor (#7483)
|
2023-09-06 16:32:47 +01:00 |
|
Rick Parker
|
615464e0c7
|
Merge pull request #7479 from corda/merge-release/os/4.10-release/os/4.11-2023-09-04-1
ES-412 Merging release/os/4.10 to release/os/4.11
|
2023-09-04 14:46:11 +01: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 |
|
Waldemar Żurowski
|
d7a5428665
|
Updated for new branch
|
2023-09-04 12:08:52 +01:00 |
|
r3-build
|
33798df51d
|
Merging forward updates from release/os/4.10 to release/os/4.11 - 2023-09-04
|
2023-09-04 10:21:44 +00: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 |
|
Waldemar Żurowski
|
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 |
|
Jose Coll
|
b0ea7a6551
|
ENT-4973 Remove redundant 2PF warning message. (#7470)
* Remove redundant warning message.
Additional assertion to validate database records deleted.
|
2023-09-01 10:01:31 +01:00 |
|
Adel El-Beik
|
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 |
|
Waldemar Żurowski
|
98be49c7de
|
Merge pull request #7468 from corda/merge-release/os/4.10-release/os/4.11-2023-08-31-4
ENT-10606 Merging release/os/4.10 to release/os/4.11
|
2023-08-31 14:54:51 +01:00 |
|
r3-build
|
5b3c8d9c1a
|
"Merging forward updates from release/os/4.11 to release/os/4.10 - 2023-08-31"
|
2023-08-31 11:08:18 +00:00 |
|
Waldemar Żurowski
|
f029420ed8
|
Merge pull request #7467 from corda/merge-release/os/4.9-release/os/4.10-2023-08-31-14
ENT-10606 Merging release/os/4.9 to release/os/4.10
|
2023-08-31 12:06:44 +01:00 |
|
r3-build
|
aa6e5000c8
|
"Merging forward updates from release/os/4.10 to release/os/4.9 - 2023-08-31"
|
2023-08-31 08:20:47 +00:00 |
|
Waldemar Żurowski
|
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 |
|
Waldemar Zurowski
|
d1a36d296b
|
INFRA-1804: Merging forward updates from release/os/4.8 to release/os/4.9
|
2023-08-30 19:45:47 +01:00 |
|
Waldemar Żurowski
|
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 |
|
Waldemar Zurowski
|
849f8666a6
|
INFRA-1804: Merging forward updates from release/os/4.7 to release/os/4.8
|
2023-08-30 16:40:20 +01:00 |
|
Waldemar Żurowski
|
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 |
|
Waldemar Zurowski
|
5daa091fdc
|
INFRA-1804: Merging forward updates from release/os/4.6 to release/os/4.7
|
2023-08-30 14:30:31 +01:00 |
|
Waldemar Żurowski
|
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 |
|
Adel El-Beik
|
3ae6db8c04
|
ENT-10122: Now also added consuming transaction id in the resolveAndMakeUpdate code path. (#7459)
|
2023-08-30 11:33:01 +01:00 |
|
Adel El-Beik
|
7500df76f4
|
Merge pull request #7461 from corda/colljos/update-notary-demo
ENT-10268 Update notary demo to ensure txn signed by all before recording.
|
2023-08-25 11:17:45 +01:00 |
|
Ronan Browne
|
9f7e599635
|
Merge pull request #7462 from corda/ronanb/merge-4.10-4.11--2023-08-24
ES-1140: Merging forward updates from 4.10 to 4.11 (2023-08-24)
|
2023-08-25 10:49:20 +01:00 |
|
Ronan Browne
|
91d2ae9364
|
ES-1140: Merging forward updates from 4.10 to 4.11 (2023-08-24)
|
2023-08-24 19:50:24 +01:00 |
|
Ronan Browne
|
00bb9dd259
|
Merge pull request #7460 from corda/ronanb/merge-4.9-4.10-2023-08-24
ENT-10606: Merging forward updates from 4.9 to 4.10 (2023-08-24)
|
2023-08-24 19:48:58 +01:00 |
|
Jose Coll
|
17a1e149fa
|
Update notary demo to ensure txn signed by all before recording.
|
2023-08-24 16:56:11 +01:00 |
|
Ronan Browne
|
2691ecd5fa
|
ENT-10606: Merging forward updates from 4.9 to 4.10 (2023-08-24)
|
2023-08-24 16:48:04 +01:00 |
|
Ronan Browne
|
a104923cd6
|
ENT-10606: fix shell artifact resolution (#7458)
|
2023-08-24 16:44:35 +01:00 |
|
Ronan Browne
|
d0645e3f88
|
Merge pull request #7457 from corda/ronanb/merge-4.10-4.11-2023-08-24
ES-1140: Merging forward updates from 4.10 to 4.11 (2023-08-23)
|
2023-08-24 15:09:25 +01:00 |
|
Ronan Browne
|
373c9d52c0
|
ES-1140: Merging forward updates from 4.10 to 4.11 (2023-08-23)
|
2023-08-24 13:15:18 +01:00 |
|
Adel El-Beik
|
2118b30ff6
|
Merge pull request #7455 from corda/shams-4.11-merge-53fe0e6c
ENT-6876, ENT-10045, ENT-9875: 4.10 to 4.11 forward merge
|
2023-08-24 11:38:02 +01:00 |
|
Ronan Browne
|
c00dab34f7
|
Merge pull request #7456 from corda/ronanb/merge-4.9--4.10-2023-08-23
ES-1140: Merging forward updates from 4.9 to 4.10 (2023-07-20)
|
2023-08-23 17:14:53 +01:00 |
|
Ronan Browne
|
d105415fb0
|
ES-1140: Merging forward updates from 4.7 to 4.8 (2023-07-20)
|
2023-08-23 16:40:17 +01:00 |
|
Shams Asari
|
6edb1b779c
|
Placate Detekt
|
2023-08-23 15:03:08 +01:00 |
|