Skip to content

backport: merge bitcoin#21404, #21415, #19314, #21882, #16939, #19084, #20602, #20253, #20480, #20736 (remove deprecated logic, use standard library alternatives) #5044

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
Merged
PastaPastaPasta merged 10 commits into from
Oct 20, 2022
Merged

backport: merge bitcoin#21404, #21415, #19314, #21882, #16939, #19084, #20602, #20253, #20480, #20736 (remove deprecated logic, use standard library alternatives) #5044

PastaPastaPasta merged 10 commits into from
Oct 20, 2022

Conversation

@kwvg
Copy link
Collaborator

@kwvg kwvg commented Oct 16, 2022

No description provided.

@kwvg kwvg force-pushed the cxx_cleanup branch 3 times, most recently from 8ccf933 to 5d2263c Compare October 16, 2022 13:30
@kwvg kwvg mentioned this pull request Oct 16, 2022
Merged
5 tasks
@github-actions
Copy link

github-actions bot commented Oct 16, 2022

This pull request has conflicts, please rebase.

@kwvg kwvg changed the title backport: merge bitcoin#21404, #21415, #21366, #21882, #16939, #19084, #20602, #20253, #20480, #20736 (remove deprecated logic, use standard library alternatives) backport: merge bitcoin#21404, #21415, #19314, #21882, #16939, #19084, #20602, #20253, #20480, #20736 (remove deprecated logic, use standard library alternatives) Oct 20, 2022
@kwvg kwvg marked this pull request as ready for review October 20, 2022 10:24
@UdjinM6 UdjinM6 added this to the 18.2 milestone Oct 20, 2022
UdjinM6
UdjinM6 previously approved these changes Oct 20, 2022
View reviewed changes
Copy link

@UdjinM6 UdjinM6 left a comment

Choose a reason for hiding this comment

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

utACK

@PastaPastaPasta
Copy link
Member

PastaPastaPasta commented Oct 20, 2022

this conflicts with #5051, but trivially rebased on top of it. Going to review 5051 first

@PastaPastaPasta
Copy link
Member

PastaPastaPasta commented Oct 20, 2022

I've rebased this on top of develop, and resolved a trivial include conflict

UdjinM6
UdjinM6 approved these changes Oct 20, 2022
View reviewed changes
Copy link

@UdjinM6 UdjinM6 left a comment

Choose a reason for hiding this comment

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

utACK

PastaPastaPasta
PastaPastaPasta reviewed Oct 20, 2022
View reviewed changes
src/llmq/utils.h Outdated
Copy link
Member

@PastaPastaPasta PastaPastaPasta Oct 20, 2022

Choose a reason for hiding this comment

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

fine, but unrelated

PastaPastaPasta
PastaPastaPasta approved these changes Oct 20, 2022
View reviewed changes
Copy link
Member

@PastaPastaPasta PastaPastaPasta left a comment

Choose a reason for hiding this comment

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

utACK for merge via merge commit

I have confirmed CI is happy

@PastaPastaPasta PastaPastaPasta merged commit 5e2eacb into dashpay:develop Oct 20, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@PastaPastaPasta PastaPastaPasta PastaPastaPasta approved these changes

@UdjinM6 UdjinM6 UdjinM6 approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

18.2

Development

Successfully merging this pull request may close these issues.

3 participants

@kwvg @PastaPastaPasta @UdjinM6