Merge 98de9eb1aa into merged_master (Bitcoin PR #19983)

This commit is contained in:
Andrew Poelstra 2021-06-15 22:35:40 +00:00
commit 939e4d0543

View file

@ -30,13 +30,7 @@ race:zmq::*
race:bitcoin-qt
# deadlock (TODO fix)
deadlock:CConnman::ForNode
deadlock:CConnman::GetNodeStats
deadlock:CChainState::ConnectTip
deadlock:UpdateTip
# WalletBatch (unidentified deadlock)
deadlock:WalletBatch
# Intentional deadlock in tests
deadlock:TestPotentialDeadLockDetected