diff options
author | Alexandre Van de Sande <alex.vandesande@ethdev.com> | 2015-02-23 20:05:15 +0800 |
---|---|---|
committer | Alexandre Van de Sande <alex.vandesande@ethdev.com> | 2015-02-23 20:05:15 +0800 |
commit | dea65840186fe861017524c9cb59ae07ac97ed06 (patch) | |
tree | 5cb5e339b9ce77a2a3c92cf8a10c4294fcf7965c /cmd/ethereum/main.go | |
parent | bb3338df6363d8267a24190584f0908463241a6c (diff) | |
parent | dd086791acf477da7641c168f82de70ed0b2dca6 (diff) | |
download | go-tangerine-dea65840186fe861017524c9cb59ae07ac97ed06.tar go-tangerine-dea65840186fe861017524c9cb59ae07ac97ed06.tar.gz go-tangerine-dea65840186fe861017524c9cb59ae07ac97ed06.tar.bz2 go-tangerine-dea65840186fe861017524c9cb59ae07ac97ed06.tar.lz go-tangerine-dea65840186fe861017524c9cb59ae07ac97ed06.tar.xz go-tangerine-dea65840186fe861017524c9cb59ae07ac97ed06.tar.zst go-tangerine-dea65840186fe861017524c9cb59ae07ac97ed06.zip |
Merge branch 'develop' into ui
Diffstat (limited to 'cmd/ethereum/main.go')
-rw-r--r-- | cmd/ethereum/main.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cmd/ethereum/main.go b/cmd/ethereum/main.go index 0dba462be..9c840de58 100644 --- a/cmd/ethereum/main.go +++ b/cmd/ethereum/main.go @@ -37,7 +37,7 @@ import ( const ( ClientIdentifier = "Ethereum(G)" - Version = "0.8.3" + Version = "0.8.5" ) var clilogger = logger.NewLogger("CLI") @@ -67,11 +67,12 @@ func main() { DataDir: Datadir, LogFile: LogFile, LogLevel: LogLevel, + LogFormat: LogFormat, MaxPeers: MaxPeer, Port: OutboundPort, NAT: NAT, KeyRing: KeyRing, - Shh: SHH, + Shh: true, Dial: Dial, BootNodes: BootNodes, NodeKey: NodeKey, |