diff options
author | Wladimir J. van der Laan <laanwj@protonmail.com> | 2020-01-23 20:42:58 +0100 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@protonmail.com> | 2020-01-23 20:48:55 +0100 |
commit | 178a8346871e17d621ac780a5c47be65508ce176 (patch) | |
tree | fb3361f10012886e7a79d9e4a57b495fc5fef9a2 /src/policy/settings.h | |
parent | 1b0afb71a2ad699c4d3cec9091dee717ea3c73a7 (diff) | |
parent | daf2fff236f8ebb75c785b33d2dd6dcd3cf86112 (diff) |
Merge #17988: [0.19] Final backports for 0.19.1v0.19.1rc1
daf2fff236f8ebb75c785b33d2dd6dcd3cf86112 test: add missing #include to fix compiler errors (Karl-Johan Alm)
c8ad23c52932cf33fac6e527ff18b5241ccceb04 bug-fix macos: give free bytes to F_PREALLOCATE (Karl-Johan Alm)
Pull request description:
We're about ready to do a [0.19.1 release](https://github.com/bitcoin/bitcoin/milestone/44); so I've opened this to collect the last remaining backports.
If there's something that's been missed / or isn't tagged ["Needs backport (0.19)"](https://github.com/bitcoin/bitcoin/issues?q=is%3Aopen+label%3A%22Needs+backport+%280.19%29%22) that you think should be, please comment.
Currently backports:
* #17887 - bug-fix macos: give free bytes to F_PREALLOCATE
* #17980 - test: add missing #include to fix compiler errors
ACKs for top commit:
laanwj:
ACK daf2fff236f8ebb75c785b33d2dd6dcd3cf86112
Tree-SHA512: 8438f992d0c39315a4da4c3f8ab5c92acefada4b0ba5a5cec3775dea2541492d386bf4e7c9e76e1494a6d4cf16a9205287d27ffd23d9c3056f213d733605eeee
Diffstat (limited to 'src/policy/settings.h')
0 files changed, 0 insertions, 0 deletions