aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPéter Szilágyi <peterke@gmail.com>2019-04-09 16:47:09 +0800
committerGitHub <noreply@github.com>2019-04-09 16:47:09 +0800
commit14ae1246b789dd2a0a2bd22f0c7d3256daa26759 (patch)
treee78db2e3447bf40f331b093e00e2717c9aeb5aff
parent4e13a09c5033b4cf073db6aeaaa7d159dcf07f30 (diff)
parentdc59af862299342d9b881b2fa06bea16839915d0 (diff)
downloadgo-tangerine-14ae1246b789dd2a0a2bd22f0c7d3256daa26759.tar
go-tangerine-14ae1246b789dd2a0a2bd22f0c7d3256daa26759.tar.gz
go-tangerine-14ae1246b789dd2a0a2bd22f0c7d3256daa26759.tar.bz2
go-tangerine-14ae1246b789dd2a0a2bd22f0c7d3256daa26759.tar.lz
go-tangerine-14ae1246b789dd2a0a2bd22f0c7d3256daa26759.tar.xz
go-tangerine-14ae1246b789dd2a0a2bd22f0c7d3256daa26759.tar.zst
go-tangerine-14ae1246b789dd2a0a2bd22f0c7d3256daa26759.zip
Merge pull request #19416 from jmcnevin/cli-fixv1.8.25
Revert flag removal
-rw-r--r--cmd/geth/main.go2
-rw-r--r--params/version.go2
-rw-r--r--swarm/version/version.go2
3 files changed, 4 insertions, 2 deletions
diff --git a/cmd/geth/main.go b/cmd/geth/main.go
index 458608112..6f605bd1c 100644
--- a/cmd/geth/main.go
+++ b/cmd/geth/main.go
@@ -125,6 +125,8 @@ var (
utils.VMEnableDebugFlag,
utils.NetworkIdFlag,
utils.ConstantinopleOverrideFlag,
+ utils.RPCCORSDomainFlag,
+ utils.RPCVirtualHostsFlag,
utils.EthStatsURLFlag,
utils.MetricsEnabledFlag,
utils.FakePoWFlag,
diff --git a/params/version.go b/params/version.go
index 7949d4fd1..5abe2ab95 100644
--- a/params/version.go
+++ b/params/version.go
@@ -23,7 +23,7 @@ import (
const (
VersionMajor = 1 // Major version component of the current release
VersionMinor = 8 // Minor version component of the current release
- VersionPatch = 24 // Patch version component of the current release
+ VersionPatch = 25 // Patch version component of the current release
VersionMeta = "stable" // Version metadata to append to the version string
)
diff --git a/swarm/version/version.go b/swarm/version/version.go
index d41110576..6c393e9c7 100644
--- a/swarm/version/version.go
+++ b/swarm/version/version.go
@@ -23,7 +23,7 @@ import (
const (
VersionMajor = 0 // Major version component of the current release
VersionMinor = 3 // Minor version component of the current release
- VersionPatch = 12 // Patch version component of the current release
+ VersionPatch = 13 // Patch version component of the current release
VersionMeta = "stable" // Version metadata to append to the version string
)