aboutsummaryrefslogtreecommitdiffstats
path: root/cmd/ethereum
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2015-03-23 04:43:58 +0800
committerobscuren <geffobscura@gmail.com>2015-03-23 04:43:58 +0800
commit59eab49cb849ca93b9608763f4842654e8044d0f (patch)
tree8a04499cb63dd8d91fd136f65c29605844c5bae8 /cmd/ethereum
parent8ed4f226d1dbecc9625a2f142e22926569198b73 (diff)
parent8b1b9fc99d63a19c216edebc07096718e835937d (diff)
downloadgo-tangerine-59eab49cb849ca93b9608763f4842654e8044d0f.tar
go-tangerine-59eab49cb849ca93b9608763f4842654e8044d0f.tar.gz
go-tangerine-59eab49cb849ca93b9608763f4842654e8044d0f.tar.bz2
go-tangerine-59eab49cb849ca93b9608763f4842654e8044d0f.tar.lz
go-tangerine-59eab49cb849ca93b9608763f4842654e8044d0f.tar.xz
go-tangerine-59eab49cb849ca93b9608763f4842654e8044d0f.tar.zst
go-tangerine-59eab49cb849ca93b9608763f4842654e8044d0f.zip
Merge branch 'ethersphere-jsonlog' into develop
Diffstat (limited to 'cmd/ethereum')
-rw-r--r--cmd/ethereum/main.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd/ethereum/main.go b/cmd/ethereum/main.go
index b9a4ff045..e351453b1 100644
--- 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,