gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/tgerring/go-ethereum into tgerring-develop

Browse Source 
Conflicts:
	rpc/http/server.go
This commit is contained in:
obscuren
2015-02-05 11:44:30 -08:00
parent db7c34a9df 429077a5a0
commit d00e2731e5
6 changed files with 45 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/mist/flags.go
View File

@@ -111,7 +111,7 @@ func Init() {
flag.StringVar(&OutboundPort, "port", "30303", "listening port")
flag.BoolVar(&UseUPnP, "upnp", true, "enable UPnP support")
flag.IntVar(&MaxPeer, "maxpeer", 30, "maximum desired peers")
flag.IntVar(&RpcPort, "rpcport", 8080, "port to start json-rpc server on")
flag.IntVar(&RpcPort, "rpcport", 8545, "port to start json-rpc server on")
flag.IntVar(&WsPort, "wsport", 40404, "port to start websocket rpc server on")
flag.BoolVar(&StartRpc, "rpc", true, "start rpc server")
flag.BoolVar(&StartWebSockets, "ws", false, "start websocket server")