Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: prepare_uncles_test failed on block_template update delayed #2124

Merged
merged 1 commit into from
Jun 17, 2020
Merged

fix: prepare_uncles_test failed on block_template update delayed #2124

merged 1 commit into from
Jun 17, 2020

Conversation

zhangsoledad
Copy link
Member

@zhangsoledad zhangsoledad commented Jun 16, 2020 •
edited

@zhangsoledad zhangsoledad requested review from a team and quake June 16, 2020 09:42
@doitian
Copy link
Member

doitian commented Jun 16, 2020

bors r=doitian,quake

bors bot added a commit that referenced this pull request Jun 16, 2020
@bors @zhangsoledad
Merge #2124
7ab3d5d 
2124: fix: prepare_uncles_test failed on block_template update delayed r=doitian,quake a=zhangsoledad

fix https://travis-ci.com/github/nervosnetwork/ckb/jobs/349597648#L1826

Co-authored-by: zhangsoledad <787953403@qq.com>
@bors
Copy link
Contributor

bors bot commented Jun 16, 2020

Build failed:

@doitian
Copy link
Member

doitian commented Jun 17, 2020

bors retry

@bors
Copy link
Contributor

bors bot commented Jun 17, 2020

Build succeeded:

@bors bors bot merged commit d8d43f3 into nervosnetwork:develop Jun 17, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@quake quake quake approved these changes

@doitian doitian doitian approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@zhangsoledad @doitian @quake