Skip to content

[25.2] Final backports and changes for 25.2rc1#29464

Merged
fanquake merged 6 commits intobitcoin:25.xfrom
achow101:25.2-backports
Feb 26, 2024
Merged

[25.2] Final backports and changes for 25.2rc1#29464
fanquake merged 6 commits intobitcoin:25.xfrom
achow101:25.2-backports

Conversation

@achow101
Copy link
Member

@achow101 achow101 commented Feb 21, 2024

Backport:

#29176 does not cleanly backport, and it also requires 27927 to work. Both are still fairly simple backports.

Also does the rest of the version bump tasks for 25.2rc1.

@achow101 achow101 added this to the 25.2 milestone Feb 21, 2024
@DrahtBot
Copy link
Contributor

DrahtBot commented Feb 21, 2024 •
edited
Loading

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Code Coverage

For detailed information about the code coverage, see the test coverage report.

Reviews

See the guideline for information on the review process.

Type Reviewers
ACK fanquake

If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.

@achow101 achow101 mentioned this pull request Feb 21, 2024
Merged
@DrahtBot
Copy link
Contributor

DrahtBot commented Feb 22, 2024

🚧 At least one of the CI tasks failed. Make sure to run all tests locally, according to the
documentation.

Possibly this is due to a silent merge conflict (the changes in this pull request being
incompatible with the current code in the target branch). If so, make sure to rebase on the latest
commit of the target branch.

Leave a comment here, if you need help tracking down a confusing failure.

Debug: https://github.com/bitcoin/bitcoin/runs/21841217972

@maflcko
Copy link
Member

maflcko commented Feb 22, 2024

lgtm

fanquake
fanquake approved these changes Feb 26, 2024
View reviewed changes
Copy link
Member

@fanquake fanquake left a comment

Choose a reason for hiding this comment

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

ACK 9f13dc1

@fanquake fanquake merged commit 1ce5acc into bitcoin:25.x Feb 26, 2024
@bitcoin bitcoin locked and limited conversation to collaborators Feb 25, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@fanquake fanquake fanquake approved these changes

Assignees

No one assigned

Labels

Backport CI failed

Projects

None yet

Milestone

25.2

Development

Successfully merging this pull request may close these issues.

4 participants

@achow101 @DrahtBot @maflcko @fanquake