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

fix: fix cli output and ban reason #1763

Merged
merged 2 commits into from
Oct 29, 2019
Merged

Conversation

driftluo
Copy link
Collaborator

@driftluo driftluo commented Oct 26, 2019

@driftluo driftluo requested a review from a team October 26, 2019 04:02
u2
u2 previously approved these changes Oct 28, 2019
@driftluo driftluo dismissed stale reviews from yangby-cryptape and u2 via 659aa05 October 28, 2019 04:22
@driftluo driftluo changed the title fix: fix cli output fix: fix cli output and ban reason Oct 28, 2019
@quake
Copy link
Member

quake commented Oct 29, 2019

bors r+

@nervos-bot nervos-bot bot added the s:ready-to-merge Status: Waiting to be merged. label Oct 29, 2019
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

Co-authored-by: driftluo <[email protected]>
@bors
Copy link
Contributor

bors bot commented Oct 29, 2019

Build failed

  • continuous-integration/travis-ci/push

@quake
Copy link
Member

quake 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 <[email protected]>
Co-authored-by: Xuejie Xiao <[email protected]>
@bors
Copy link
Contributor

bors bot commented Oct 29, 2019

Build succeeded

  • continuous-integration/travis-ci/push

@bors bors bot merged commit 52dcee7 into nervosnetwork:develop Oct 29, 2019
@driftluo driftluo deleted the fix-cli-output branch October 29, 2019 09:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
s:ready-to-merge Status: Waiting to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

ckb cli secp256k1-lock should return a single bytes as args
4 participants