CORE-18414: Merging forward updates from release/os/5.1 to release/os/5.2 - 2023-11-21 #5140
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![corda-jenkins-ci02[bot]](https://avatars.githubusercontent.com/u/22600631?s=60&v=4){kind=small}
…and (#5114) * CORE-18357: Allow old version of SetOwnRegistrationStatus in the command * Set to the correct version
The query for `findUnconsumedStatesByExactType` did not actually filter by `consumed IS NULL` so it returned all states regardless of if they were consumed or not. Added `consumed IS NULL` to fix this.
Makes `MemberInfo` serializable by registering custom serializers for `MemberContext` and `MGMContext`. The corresponding corda-api change marks these interfaces as `@CordaSerializable`.
…#5107) A bug was observed whereby Kafka producer errors were not being correctly reported back to the MultiSourceEventMediator. This is because our Kafka messages are essentially 'fire-and-forget'; when something goes wrong, Kafka will exceptionally close a future in the background, but we never attempted to capture or track this future. This PR adds a callback which will log this exception clearly for the user.
corda-jenkins-ci02
bot
requested review from
YashNabar,
ben-millar,
lankydan and
yift-r3
|
Please remember to 'Merge' all forward merges and do not 'Squash and Merge' |
ghost
reviewed
Nov 21, 2023
There was a problem hiding this comment.
Rule: 2-PEM-PRIVATE
Severity:
File: docs/kafka/security/demo/certificates/ca/ca-key
Lines: 1
Scanner: Secret Diver
More Info
Contains a private key
|
Kudos, SonarCloud Quality Gate passed!
|
|
Jenkins build for PR 5140 build 2 Build Successful: |
ben-millar
approved these changes
Nov 23, 2023
lankydan
approved these changes
Nov 24, 2023
ronanbrowne
deleted the
merge-release/os/5.1-release/os/5.2-2023-11-21-19
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR was created by the merge bot.
Includes:
findUnconsumedStatesByExactType(CORE-18370 FixfindUnconsumedStatesByExactType#5111)