Merge remote-tracking branch 'origin/develop' into eris-client (aef9561e) · Commits · Hang Yu / burrow · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

B

burrow
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

aef9561e

Commit aef9561e authored 8 years ago by Benjamin Bollen

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/develop' into eris-client

parents 864c7302 5de1ed64

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

manager/eris-mint/eris-mint.go 6 additions, 9 deletions

manager/eris-mint/eris-mint.go
manager/eris-mint/pipe.go 5 additions, 5 deletions

manager/eris-mint/pipe.go
manager/eris-mint/state/execution.go 1 addition, 0 deletions

manager/eris-mint/state/execution.go
rpc/tendermint/client/client.go 85 additions, 111 deletions

rpc/tendermint/client/client.go
rpc/tendermint/test/client_ws_test.go 30 additions, 23 deletions

rpc/tendermint/test/client_ws_test.go
rpc/tendermint/test/tests.go 58 additions, 69 deletions

rpc/tendermint/test/tests.go
rpc/tendermint/test/ws_helpers.go 118 additions, 47 deletions

rpc/tendermint/test/ws_helpers.go

with 303 additions and 264 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment