Skip to content

merge bitcoin 15746, 16240, 17192, 17318, 17809, 18098, 18444, 18607, 19100, 19386: rpc backports#4708

Merged
UdjinM6 merged 16 commits into
dashpay:developfrom
kwvg:json_cleanup
Mar 15, 2022
Merged

merge bitcoin 15746, 16240, 17192, 17318, 17809, 18098, 18444, 18607, 19100, 19386: rpc backports#4708
UdjinM6 merged 16 commits into
dashpay:developfrom
kwvg:json_cleanup

Conversation

@kwvg
Copy link
Copy Markdown
Collaborator

@kwvg kwvg commented Feb 26, 2022

No description provided.

Copy link
Copy Markdown
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 merging via merge commit

@kwvg kwvg marked this pull request as draft February 27, 2022 06:35
@kwvg kwvg marked this pull request as ready for review February 27, 2022 09:43
@kwvg kwvg force-pushed the json_cleanup branch 2 times, most recently from 032a05a to f76b2b0 Compare February 27, 2022 10:16
@PastaPastaPasta
Copy link
Copy Markdown
Member

uhh lol, that's a lot bigger of a PR now 😂

@kwvg kwvg force-pushed the json_cleanup branch 2 times, most recently from 603e7e4 to 8a173fb Compare March 4, 2022 14:51
@github-actions
Copy link
Copy Markdown

github-actions Bot commented Mar 5, 2022

This pull request has conflicts, please rebase.

Copy link
Copy Markdown
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 merging via merge commit

@UdjinM6 UdjinM6 added this to the 18 milestone Mar 14, 2022
@UdjinM6
Copy link
Copy Markdown

UdjinM6 commented Mar 14, 2022

Is there a reason why 16240 and 19386 (should be marked partial btw) are incomplete?

@kwvg
Copy link
Copy Markdown
Collaborator Author

kwvg commented Mar 15, 2022

16240 was marked as partial as b6fb617 was excluded as this PR favours logical backports as it is a dependency for two other PRs and a complete backport would invite a lot of potential merge conflicts (19250 needed me to resolve conflicts multiple times, for instance)

The same applies for 19386's fa7592b.

@UdjinM6 UdjinM6 changed the title merge bitcoin#17192, 16240: rpc backports merge bitcoin#15746, 16240, 17192, 17318, 17809, 18098, 18444, 18607, 19100, 19386: rpc backports Mar 15, 2022
@UdjinM6 UdjinM6 changed the title merge bitcoin#15746, 16240, 17192, 17318, 17809, 18098, 18444, 18607, 19100, 19386: rpc backports merge bitcoin 15746, 16240, 17192, 17318, 17809, 18098, 18444, 18607, 19100, 19386: rpc backports Mar 15, 2022
Copy link
Copy Markdown

@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.

@UdjinM6 UdjinM6 merged commit f1a6474 into dashpay:develop Mar 15, 2022
@kwvg kwvg deleted the json_cleanup branch July 18, 2023 11:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants