Skip to content

Conversation

@furszy
Copy link

@furszy furszy commented Aug 11, 2020

Quick back ports, coming from dashpay#5983 and bitcoin#9227.

@furszy furszy self-assigned this Aug 11, 2020
@furszy
Copy link
Author

furszy commented Aug 11, 2020

Have included bitcoin#8564
Was going to push it in a separate PR but the changes are small enough to be here as well.

Edit: Removed it, it was causing some issues. Better to push it separately.

@furszy furszy force-pushed the 2020_backport_9227 branch from a678f86 to 2e2b5af Compare August 12, 2020 03:55
Copy link
Collaborator

@Fuzzbawls Fuzzbawls left a comment

Choose a reason for hiding this comment

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

Small nit, but otherwise looking good

@Fuzzbawls Fuzzbawls added this to the 5.0.0 milestone Aug 12, 2020
coming from btc@d63ff6265b0c6ae30efcbb9120d4db419606198a
@furszy furszy force-pushed the 2020_backport_9227 branch from 2e2b5af to 5069899 Compare August 12, 2020 23:07
Copy link

@random-zebra random-zebra left a comment

Choose a reason for hiding this comment

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

utACK 5069899

This will conflict with #1811, which removes the argument of ThreadFlushWalletDB. We can probably merge this one first, as it is easier.

Copy link
Collaborator

@Fuzzbawls Fuzzbawls left a comment

Choose a reason for hiding this comment

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

utACK 5069899

@random-zebra random-zebra merged commit 7db7724 into PIVX-Project:master Aug 23, 2020
@random-zebra random-zebra modified the milestones: 5.0.0, 4.3.0 Sep 10, 2020
@furszy furszy deleted the 2020_backport_9227 branch November 29, 2022 14:09
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