Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync delivery to master after 15-rc3 #4486

Merged
merged 10 commits into from
Aug 10, 2022

Conversation

neilcsmith-net
Copy link
Member

Replaces #4453 to handle merge conflict.

cc @matthiasblaesing can you do a quick sanity check while the tests run? Thanks.

@mbien
Copy link
Member

mbien commented Aug 9, 2022

looks good to me, all PRs are here and this seems to be a copy of master so it should be all good.

Copy link
Contributor

@matthiasblaesing matthiasblaesing left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks sane to me. If I read the output of gitk correctly the merge conflict is in junixsocket.The resolution looks right to me.

@neilcsmith-net
Copy link
Member Author

Thanks @matthiasblaesing Just a conflict with module versions in junixsocket as master had already been incremented. As I was waiting for Travis I thought I'd ask for double check. Merging now.

@neilcsmith-net neilcsmith-net merged commit eb1cf21 into apache:master Aug 10, 2022
@neilcsmith-net neilcsmith-net deleted the sync-15rc3 branch August 10, 2022 08:18
@mbien mbien added the Release process PRs (eg. versions, sync) that are part of the release process and can be ignored in release notes. label Dec 3, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Release process PRs (eg. versions, sync) that are part of the release process and can be ignored in release notes.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants