From 290e851f57f5d27a1d5f0f7ad784c836e017c337 Mon Sep 17 00:00:00 2001 From: Jeffrey Wilcke Date: Mon, 9 May 2016 22:06:27 +0200 Subject: [PATCH 1/4] VERSION, cmd/geth: bumped version 1.4.2 --- cmd/geth/main.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cmd/geth/main.go b/cmd/geth/main.go index 975644d612..ff9b754858 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -47,11 +47,11 @@ import ( ) const ( - clientIdentifier = "Geth" // Client identifier to advertise over the network - versionMajor = 1 // Major version component of the current release - versionMinor = 4 // Minor version component of the current release - versionPatch = 1 // Patch version component of the current release - versionMeta = "rc" // Version metadata to append to the version string + clientIdentifier = "Geth" // Client identifier to advertise over the network + versionMajor = 1 // Major version component of the current release + versionMinor = 4 // Minor version component of the current release + versionPatch = 2 // Patch version component of the current release + versionMeta = "stable" // Version metadata to append to the version string versionOracle = "0xfa7b9770ca4cb04296cac84f37736d4041251cdf" // Ethereum address of the Geth release oracle ) From 2a3657d8d9e7f091966481801a0a27d3ddbfb492 Mon Sep 17 00:00:00 2001 From: Jeffrey Wilcke Date: Mon, 9 May 2016 22:06:27 +0200 Subject: [PATCH 2/4] VERSION, cmd/geth: bumped version 1.4.2 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 347f5833ee..9df886c42a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.4.1 +1.4.2 From 6826b2040f0d5eaebad8b68eb46bd2b738eef3fc Mon Sep 17 00:00:00 2001 From: Jeffrey Wilcke Date: Tue, 10 May 2016 13:35:01 +0200 Subject: [PATCH 3/4] [release/1.4.3] miner: fixed pending state by not shutting down update loop (cherry picked from commit a824c3f02f74eb11b4382abbb92aa8babc5d685c) --- miner/worker.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/miner/worker.go b/miner/worker.go index 3d1928bf63..fe759560c2 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -145,7 +145,6 @@ func newWorker(config *core.ChainConfig, coinbase common.Address, eth core.Backe fullValidation: false, } worker.events = worker.mux.Subscribe(core.ChainHeadEvent{}, core.ChainSideEvent{}, core.TxPreEvent{}) - worker.wg.Add(1) go worker.update() go worker.wait() @@ -188,8 +187,6 @@ func (self *worker) start() { } func (self *worker) stop() { - // Quit update. - self.events.Unsubscribe() self.wg.Wait() self.mu.Lock() @@ -224,7 +221,6 @@ func (self *worker) unregister(agent Agent) { } func (self *worker) update() { - defer self.wg.Done() for event := range self.events.Chan() { // A real event arrived, process interesting content switch ev := event.Data.(type) { From f213a9d8e864b288e5974e947ed138b828ad0dfa Mon Sep 17 00:00:00 2001 From: Jeffrey Wilcke Date: Tue, 10 May 2016 13:45:13 +0200 Subject: [PATCH 4/4] VERSION, cmd/geth: bumped version 1.4.3 --- VERSION | 2 +- cmd/geth/main.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 9df886c42a..428b770e3e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.4.2 +1.4.3 diff --git a/cmd/geth/main.go b/cmd/geth/main.go index ff9b754858..a6c36582c9 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -50,7 +50,7 @@ const ( clientIdentifier = "Geth" // Client identifier to advertise over the network versionMajor = 1 // Major version component of the current release versionMinor = 4 // Minor version component of the current release - versionPatch = 2 // Patch version component of the current release + versionPatch = 3 // Patch version component of the current release versionMeta = "stable" // Version metadata to append to the version string versionOracle = "0xfa7b9770ca4cb04296cac84f37736d4041251cdf" // Ethereum address of the Geth release oracle