blockchain.py is failing on master and 0.12, due to a subtle merge conflict when #7194 was merged.
@laanwj Needs backport
[Tests] Fix error in blockchain.py introduced in merge #7373
pull sdaftuar wants to merge 1 commits into bitcoin:master from sdaftuar:fix-blockchain-py changing 1 files +1 −1-
sdaftuar commented at 2:25 PM on January 18, 2016: member
-
Fix error in blockchain.py introduced in merge 4a04879378
-
MarcoFalke commented at 2:26 PM on January 18, 2016: member
Awesome, just was about to open the pull myself.
utACK 4a04879
-
laanwj commented at 2:27 PM on January 18, 2016: member
ugh, went a bit too fast there Thanks. ACK.
- laanwj added the label Tests on Jan 18, 2016
-
MarcoFalke commented at 2:43 PM on January 18, 2016: member
Travis should re-evaluate pulls every 10 days, imo. The travis result from #7194 was more than 30 days old.
-
laanwj commented at 2:45 PM on January 18, 2016: 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 merged this on Jan 18, 2016
- laanwj closed this on Jan 18, 2016
- laanwj referenced this in commit e2ed57e61e on Jan 18, 2016
- laanwj referenced this in commit 51af87f078 on Jan 18, 2016
- MarcoFalke locked this on Sep 8, 2021
Contributors
Labels