Merge branch 'axon-5.1.x'#4590
Merged
Merged
Conversation
hjohn
requested review from
jangalinski,
laura-devriendt-lemon and
zambrovski
and removed request for
a team
Contributor
|
I would remove the |
MateuszNaKodach
requested changes
May 19, 2026
hjohn
force-pushed
the
merge/axon-5.1.x-to-main
branch
2 times, most recently
from
56d0d2c to
b034625
Compare
Merge axon-5.1.x into main, resolving conflicts: - MergeTask.java: take axon-5.1.x version removing redundant releaseClaim (bug fix #4583) - axon-5/api-changes.md: keep main version (file was split into per-topic files on main)
hjohn
force-pushed
the
merge/axon-5.1.x-to-main
branch
from
b034625 to
2c48431
Compare
Contributor
Author
I removed the old file, and checked what changes still were in there and merged those with the split version (only some package renames). |
|
smcvb
added
Priority 1: Must
MateuszNaKodach
approved these changes
May 19, 2026
Contributor
MateuszNaKodach
left a comment
MateuszNaKodach
left a comment
There was a problem hiding this comment.
I focused on my own changes, so from the PR:
#4583
This looks good. If you're sure about others - feel free to merge :)
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Merge axon-5.1.x into main, resolving conflicts: