Skip to content

Conversation

@laanwj
Copy link
Member

@laanwj laanwj commented Oct 25, 2016

backports for 0.13.2

@luke-jr
Copy link
Member

luke-jr commented Oct 25, 2016

#8357 and #8845 might be candidates

@laanwj laanwj added this to the 0.13.1 milestone Oct 25, 2016
@laanwj laanwj closed this Oct 25, 2016
@maflcko maflcko changed the title 0.13.1 backports conditional on rc3 0.13.2 backports Oct 25, 2016
@maflcko maflcko modified the milestones: 0.13.2, 0.13.1 Oct 25, 2016
@maflcko
Copy link
Member

maflcko commented Oct 27, 2016

@laanwj: Needs rebase for 0.13.2 (I changed the title)

@maflcko maflcko reopened this Oct 27, 2016
TheBlueMatt and others added 7 commits October 27, 2016 14:47
Note that this is not a major issue as, in order for the missing
lock to cause issues, you have to receive a GETBLOCKTXN message
while reindexing, adding a block header via RPC, etc, which results
in either a table rehash or an insert into the bucket which you are
currently looking at.

Github-Pull: bitcoin#8995
Rebased-From: dfe7906
@laanwj laanwj force-pushed the 2016_10_backports_conditional_rc3 branch from 381352e to b16cdb7 Compare October 27, 2016 12:47
@laanwj
Copy link
Member Author

laanwj commented Oct 27, 2016

Done

@laanwj laanwj merged commit b16cdb7 into bitcoin:0.13 Nov 2, 2016
laanwj added a commit that referenced this pull request Nov 2, 2016
b16cdb7 Add MIT license to build-aux/m4 scripts (Luke Dashjr)
2cfcca7 Trivial: build-aux/m4/l_atomic: Fix typo (Luke Dashjr)
fa58e55 Add MIT license to autogen.sh and share/genbuild.sh (Luke Dashjr)
6d05fe1 Add MIT license to Makefiles (Luke Dashjr)
1d048b9 Don't return the address of a P2SH of a P2SH. (jnewbery)
ce0d817 Fix relaypriority calculation error (maiiz)
9ef3875 Add missing cs_main lock to ::GETBLOCKTXN processing (Matt Corallo)
schinzelh referenced this pull request in dashpay/dash Oct 23, 2017
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants