diff options
author | obscuren <geffobscura@gmail.com> | 2015-05-22 00:59:26 +0800 |
---|---|---|
committer | obscuren <geffobscura@gmail.com> | 2015-05-22 00:59:26 +0800 |
commit | 8c25a837086c8e1f5471b4dc24afb6e5045e21cc (patch) | |
tree | 05471c7e1862733478b08e18bd7ed9419f7f7297 | |
parent | f1cc3619f5bed55d803532f65f80b38fa760664b (diff) | |
parent | 3ea9868b656077c38af5ea8590761c3218ce558e (diff) | |
download | dexon-8c25a837086c8e1f5471b4dc24afb6e5045e21cc.tar dexon-8c25a837086c8e1f5471b4dc24afb6e5045e21cc.tar.gz dexon-8c25a837086c8e1f5471b4dc24afb6e5045e21cc.tar.bz2 dexon-8c25a837086c8e1f5471b4dc24afb6e5045e21cc.tar.lz dexon-8c25a837086c8e1f5471b4dc24afb6e5045e21cc.tar.xz dexon-8c25a837086c8e1f5471b4dc24afb6e5045e21cc.tar.zst dexon-8c25a837086c8e1f5471b4dc24afb6e5045e21cc.zip |
Merge branch 'release/0.9.23' into develop
-rw-r--r-- | cmd/geth/main.go | 2 | ||||
-rw-r--r-- | miner/miner.go | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/cmd/geth/main.go b/cmd/geth/main.go index 6d345a18b..513b405ff 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -48,7 +48,7 @@ import _ "net/http/pprof" const ( ClientIdentifier = "Geth" - Version = "0.9.22" + Version = "0.9.23" ) var ( diff --git a/miner/miner.go b/miner/miner.go index c9427f302..4e99245f8 100644 --- a/miner/miner.go +++ b/miner/miner.go @@ -65,6 +65,8 @@ func (self *Miner) update() { } // unsubscribe. we're only interested in this event once events.Unsubscribe() + // stop immediately and ignore all further pending events + break } } |