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

8b1b9fc9

Commit 8b1b9fc9 authored 10 years ago by Jeffrey Wilcke

Downloads
- Plain Diff

Merge branch 'jsonlog' of https://github.com/ethersphere/go-ethereum into ethersphere-jsonlog

Conflicts:
	eth/backend.go

parents 8ed4f226 0edb3356

No related branches found

No related tags found

Loading

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

blockpool/test/logger.go 6 additions, 12 deletions

blockpool/test/logger.go
cmd/ethereum/main.go 1 addition, 1 deletion

cmd/ethereum/main.go
cmd/utils/flags.go 5 additions, 5 deletions

cmd/utils/flags.go
eth/backend.go 21 additions, 17 deletions

eth/backend.go
logger/log.go 16 additions, 8 deletions

logger/log.go
logger/loggers.go 3 additions, 4 deletions

logger/loggers.go
logger/loggers_test.go 6 additions, 4 deletions

logger/loggers_test.go
logger/logsystem.go 17 additions, 44 deletions

logger/logsystem.go
logger/sys.go 30 additions, 15 deletions

logger/sys.go

with 105 additions and 110 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