aboutsummaryrefslogtreecommitdiff
path: root/src/merkleblock.cpp
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2015-08-06 14:14:48 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2015-08-06 14:15:54 +0200
commita4fe57da6207c1e5691a1e843d22db571f3f0186 (patch)
treee2d25c76084cf4e2a4fd151db35185b955d2f5af /src/merkleblock.cpp
parent2f746c6e8a5d10fa2d432de9b43b694f40d5f4a1 (diff)
Revert "Assert on probable deadlocks if the second lock isnt try_lock"
Disabling this for now - too many intermittent Travis issues. This reverts commit 0fcc4e1e04082daf6e97e05bfb26e4b94e54ea53 (pull #5515).
Diffstat (limited to 'src/merkleblock.cpp')
0 files changed, 0 insertions, 0 deletions