Merge branch 'develop' into release/1.4

Conflicts: cmd/geth/main.go
2026-02-28 14:06:45 +01:00 · 2016-05-03 14:05:30 +02:00 · 2016-05-03 13:52:58 +02:00 · 2016-04-19 18:15:04 +02:00
2 changed files with 6 additions and 6 deletions
--- a/2
+++ b/2
@@ -1 +1 @@
-1.5.0
+1.4.1
--- 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     = 5          // Minor version component of the current release
-	versionPatch     = 0          // Patch version component of the current release
-	versionMeta      = "unstable" // 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     = 1      // Patch version component of the current release
+	versionMeta      = "rc"   // Version metadata to append to the version string

 	versionOracle = "0xfa7b9770ca4cb04296cac84f37736d4041251cdf" // Ethereum address of the Geth release oracle
 )
Author	SHA1	Message	Date
Jeffrey Wilcke	4b9de75623	Merge branch 'develop' into release/1.4	2016-05-03 14:05:30 +02:00
Jeffrey Wilcke	d52a693f80	Merge branch 'develop' into release/1.4 Conflicts: cmd/geth/main.go	2016-05-03 13:52:58 +02:00
Jeffrey Wilcke	8241fa5227	VERSION, cmd/geth: bumped version	2016-04-19 18:15:04 +02:00
@@ -1 +1 @@
 .5.0
 .4.1