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

Conflicts: eth/backend.go
2015-03-22 21:43:36 +01:00
parent 8ed4f226d1 0edb33566f
commit 8b1b9fc99d
9 changed files with 106 additions and 111 deletions
--- a/cmd/ethereum/main.go
+++ b/cmd/ethereum/main.go
@@ -135,7 +135,7 @@ The Ethereum JavaScript VM exposes a node admin interface as well as the DAPP Ja
 		utils.JSpathFlag,
 		utils.ListenPortFlag,
 		utils.LogFileFlag,
-		utils.LogFormatFlag,
+		utils.LogJSONFlag,
 		utils.LogLevelFlag,
 		utils.MaxPeersFlag,
 		utils.MinerThreadsFlag,