Merge branch 'develop' into poc-9

2015-03-04 10:51:44 +01:00
parent 84a4f761f3 a56243075a
commit 5817dab89e
2 changed files with 12 additions and 14 deletions
--- a/cmd/ethereum/flags.go
+++ b/cmd/ethereum/flags.go
@ -133,7 +133,6 @@ func Init() {

 	flag.StringVar(&BootNodes, "bootnodes", "", "space-separated node URLs for discovery bootstrap")
 	flag.IntVar(&MaxPeer, "maxpeer", 30, "maximum desired peers")
-	flag.IntVar(&MinerThreads, "minerthreads", runtime.NumCPU(), "number of miner threads")

 	flag.Parse()