diff options
| author | Ethan Buchman <ethan@coinculture.info> | 2015-02-27 06:54:57 +0800 |
|---|---|---|
| committer | Ethan Buchman <ethan@coinculture.info> | 2015-02-27 06:54:57 +0800 |
| commit | 5a827417d9cef0d2a765df11e747b1755bf04898 (patch) | |
| tree | cd3764686dcb59f5b1b9faf16c9f29dcc5efd593 /cmd/ethereum/main.go | |
| parent | 9446489cf3f2eb4b5237b9355b3975fde2886508 (diff) | |
| parent | cc5c8a444dbc23501ba1a131eb2334f4b5e1ce9f (diff) | |
| download | dexon-5a827417d9cef0d2a765df11e747b1755bf04898.tar dexon-5a827417d9cef0d2a765df11e747b1755bf04898.tar.gz dexon-5a827417d9cef0d2a765df11e747b1755bf04898.tar.bz2 dexon-5a827417d9cef0d2a765df11e747b1755bf04898.tar.lz dexon-5a827417d9cef0d2a765df11e747b1755bf04898.tar.xz dexon-5a827417d9cef0d2a765df11e747b1755bf04898.tar.zst dexon-5a827417d9cef0d2a765df11e747b1755bf04898.zip | |
Merge branch 'develop' of https://github.com/ethereum/go-ethereum into develop
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..45e6f7b93 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.6" ) 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, |