good morning!!!!

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

B

bor
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

090f593b

Commit 090f593b authored 9 years ago by Jeffrey Wilcke

Downloads
- Plain Diff

Merge branch 'karalabe-cherry-trusted-peers' into develop

parents 24d44f35 062fa049

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

cmd/geth/admin.go 3 additions, 3 deletions

cmd/geth/admin.go
cmd/mist/ui_lib.go 2 additions, 2 deletions

cmd/mist/ui_lib.go
eth/backend.go 49 additions, 4 deletions

eth/backend.go
p2p/handshake.go 7 additions, 7 deletions

p2p/handshake.go
p2p/handshake_test.go 2 additions, 2 deletions

p2p/handshake_test.go
p2p/server.go 101 additions, 18 deletions

p2p/server.go
p2p/server_test.go 153 additions, 3 deletions

p2p/server_test.go

with 317 additions and 39 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