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.

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

feat: Adapt to 2-phase Nervos DAO implementation #1769

Merged
merged 1 commit into from Oct 29, 2019

Conversation

@xxuejie
Copy link
Member

xxuejie commented Oct 28, 2019

@xxuejie xxuejie requested a review from nervosnetwork/ckb-code-review as a code owner Oct 28, 2019
@xxuejie xxuejie requested a review from nervosnetwork/ckb-dev Oct 28, 2019
@quake
quake approved these changes Oct 28, 2019
@doitian doitian added this to 🔴 High priority in CKB Pull Requests Oct 28, 2019
@doitian doitian added this to the v0.24.0 milestone Oct 28, 2019
CKB Pull Requests automation moved this from 🔴 High priority to ✅ Reviewer approved Oct 28, 2019
@u2
u2 approved these changes Oct 29, 2019
@doitian

This comment has been minimized.

Copy link
Member

doitian commented Oct 29, 2019

bors r+

bors bot added a commit that referenced this pull request Oct 29, 2019
1763: fix: fix cli output and ban reason r=quake a=driftluo

1. fix #1746
2. add reason on `ban_peer` in cx trait

1769: feat: Adapt to 2-phase Nervos DAO implementation r=doitian a=xxuejie

Depends on nervosnetwork/ckb-system-scripts#59

Co-authored-by: driftluo <driftluo@foxmail.com>
Co-authored-by: Xuejie Xiao <xxuejie@gmail.com>
@bors

This comment has been minimized.

Copy link
Contributor

bors bot commented Oct 29, 2019

Build succeeded

  • continuous-integration/travis-ci/push
@bors bors bot merged commit 3f85a7a into nervosnetwork:develop Oct 29, 2019
5 checks passed
5 checks passed
Dummy CI CI that does nothing
Details
Travis CI - Pull Request Build Passed
Details
bors Build succeeded
Details
nervosnetwork.ckb Build #20191028.22 succeeded
Details
nervosnetwork.ckb (UnitTest) UnitTest succeeded
Details
CKB Pull Requests automation moved this from ✅ Reviewer approved to Done Oct 29, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
5 participants
You can’t perform that action at this time.