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.

Sign up for GitHub

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

Jump to bottom

Remove deprecated --Xmerge-support option #4518

Merged
merged 3 commits into from
Oct 12, 2022
Merged

Remove deprecated --Xmerge-support option #4518

merged 3 commits into from
Oct 12, 2022

Conversation

fab-10
Copy link
Contributor

@fab-10 fab-10 commented Oct 11, 2022 •
edited

Signed-off-by: Fabio Di Fabio fabio.difabio@consensys.net

PR description

Remove deprecated --Xmerge-support option

Fixed Issue(s)

Documentation

  • I thought about documentation and added the doc-change-required label to this PR if
    updates are required.

Changelog

@fab-10
Remove deprecated --XMerge-support option
00ce4cb 
Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
@fab-10
Update CHANGELOG
7e920ac 
Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
@fab-10 fab-10 added doc-change-required Indicates an issue or PR that requires doc to be updated breaking This can only be addressed/merged for a release that allows user-facing changes to be breaking. mainnet labels Oct 11, 2022
@fab-10 fab-10 marked this pull request as ready for review October 11, 2022 12:12
garyschulte
garyschulte approved these changes Oct 11, 2022
View reviewed changes
Copy link
Contributor

@garyschulte garyschulte left a comment

Choose a reason for hiding this comment

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

🚢

@macfarla macfarla enabled auto-merge (squash) October 12, 2022 00:12
@macfarla macfarla merged commit 97cf43b into hyperledger:main Oct 12, 2022
@bgravenorst bgravenorst mentioned this pull request Oct 31, 2022
Closed
@bgravenorst bgravenorst removed the doc-change-required Indicates an issue or PR that requires doc to be updated label Oct 31, 2022
eum602 pushed a commit to lacchain/besu that referenced this pull request Nov 3, 2023
@fab-10 @macfarla @eum602
Remove deprecated --Xmerge-support option (hyperledger#4518)
2d1a478 
* Remove deprecated --XMerge-support option

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

* Update CHANGELOG

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
Co-authored-by: Sally MacFarlane <macfarla.github@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jflo jflo jflo approved these changes

@garyschulte garyschulte garyschulte approved these changes

Assignees
No one assigned
Labels
breaking This can only be addressed/merged for a release that allows user-facing changes to be breaking. mainnet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@fab-10 @jflo @garyschulte @macfarla @bgravenorst