diff options
| author | laanwj <126646+laanwj@users.noreply.github.com> | 2022-04-08 15:51:40 +0200 |
|---|---|---|
| committer | laanwj <126646+laanwj@users.noreply.github.com> | 2022-04-08 15:53:08 +0200 |
| commit | 308a2022c0f4367e2f7a3ec002f72589975f565c (patch) | |
| tree | ecf8ef81723fce3f17c696daed91995eac6dba65 /src/qt | |
| parent | 1ea76767d081054fe40c98f241b484d18133389e (diff) | |
| parent | e3e4be9cd513c85311634a8128e018dbf8748888 (diff) | |
| download | bitcoin-308a2022c0f4367e2f7a3ec002f72589975f565c.tar.xz | |
Merge bitcoin/bitcoin#24807: [23.x] Final rc4 backports
e3e4be9cd513c85311634a8128e018dbf8748888 RPC: Switch getblockfrompeer back to standard param name blockhash (Luke Dashjr)
69cc83df69e5a9306a0090df0dade38d5383af4d Add DEBUG_LOCKCONTENTION documentation to the developer notes (Jon Atack)
6374e24887e3957cfcf17841a8c48cac2ffbda4f Put lock logging behind DEBUG_LOCKCONTENTION preprocessor directive (Jon Atack)
Pull request description:
Backports:
* #24770
* #24806
ACKs for top commit:
laanwj:
Commit list and code review ACK e3e4be9cd513c85311634a8128e018dbf8748888
jonatack:
Code review and commit metadata ACK e3e4be9cd513c85311634a8128e018dbf8748888
Tree-SHA512: eff2b506379a9396b12b42ed2858e3eb9403a55950d6dec0b5dcc95c4c2998cddf9e0ec88af2f8ac5a7bece4d4537acede1c75f59bbc6616bee273384f87f6b0
Diffstat (limited to 'src/qt')
0 files changed, 0 insertions, 0 deletions