[Tests] Fix error in blockchain.py introduced in merge#7373
Merged
laanwj merged 1 commit intobitcoin:masterfrom Jan 18, 2016
Merged
[Tests] Fix error in blockchain.py introduced in merge#7373laanwj merged 1 commit intobitcoin:masterfrom
laanwj merged 1 commit intobitcoin:masterfrom
Conversation
Member
|
Awesome, just was about to open the pull myself. utACK 4a04879 |
Member
|
ugh, went a bit too fast there |
Member
|
Travis should re-evaluate pulls every 10 days, imo. The travis result from #7194 was more than 30 days old. |
Member
|
I usually manually check after merging (but before pushing), but skipped in this case as I wanted to merge a bunch low-risk/trivial ones at the same time. Bad idea. |
laanwj
added a commit
that referenced
this pull request
Jan 18, 2016
4a04879 Fix error in blockchain.py introduced in merge (Suhas Daftuar)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
blockchain.pyis failing on master and 0.12, due to a subtle merge conflict when #7194 was merged.@laanwj Needs backport