Merge pull request #16401 from jmhbnz/update-to-go-1.20
[3.5] Backport update to golang 1.20 minor release
This commit is contained in:
commit
2d2e75dd8e
@ -1 +1 @@
|
||||
1.19.12
|
||||
1.20.7
|
||||
|
2
Makefile
2
Makefile
@ -55,7 +55,7 @@ docker-remove:
|
||||
|
||||
|
||||
|
||||
GO_VERSION ?= 1.19.9
|
||||
GO_VERSION ?= 1.20.7
|
||||
ETCD_VERSION ?= $(shell git rev-parse --short HEAD || echo "GitNotFound")
|
||||
|
||||
TEST_SUFFIX = $(shell date +%s | base64 | head -c 15)
|
||||
|
@ -1,6 +1,6 @@
|
||||
module go.etcd.io/etcd/api/v3
|
||||
|
||||
go 1.19
|
||||
go 1.20
|
||||
|
||||
require (
|
||||
github.com/coreos/go-semver v0.3.0
|
||||
|
@ -1,6 +1,6 @@
|
||||
module go.etcd.io/etcd/client/pkg/v3
|
||||
|
||||
go 1.19
|
||||
go 1.20
|
||||
|
||||
require (
|
||||
github.com/coreos/go-systemd/v22 v22.3.2
|
||||
|
@ -1,6 +1,6 @@
|
||||
module go.etcd.io/etcd/client/v2
|
||||
|
||||
go 1.19
|
||||
go 1.20
|
||||
|
||||
require (
|
||||
github.com/json-iterator/go v1.1.11
|
||||
|
@ -1,6 +1,6 @@
|
||||
module go.etcd.io/etcd/client/v3
|
||||
|
||||
go 1.19
|
||||
go 1.20
|
||||
|
||||
require (
|
||||
github.com/dustin/go-humanize v1.0.0
|
||||
|
@ -1,6 +1,6 @@
|
||||
module go.etcd.io/etcd/etcdctl/v3
|
||||
|
||||
go 1.19
|
||||
go 1.20
|
||||
|
||||
require (
|
||||
github.com/bgentry/speakeasy v0.1.0
|
||||
|
@ -1,6 +1,6 @@
|
||||
module go.etcd.io/etcd/etcdutl/v3
|
||||
|
||||
go 1.19
|
||||
go 1.20
|
||||
|
||||
replace (
|
||||
go.etcd.io/etcd/api/v3 => ../api
|
||||
|
2
go.mod
2
go.mod
@ -1,6 +1,6 @@
|
||||
module go.etcd.io/etcd/v3
|
||||
|
||||
go 1.19
|
||||
go 1.20
|
||||
|
||||
replace (
|
||||
go.etcd.io/etcd/api/v3 => ./api
|
||||
|
@ -1,6 +1,6 @@
|
||||
module go.etcd.io/etcd/pkg/v3
|
||||
|
||||
go 1.19
|
||||
go 1.20
|
||||
|
||||
require (
|
||||
github.com/creack/pty v1.1.11
|
||||
|
@ -1,6 +1,6 @@
|
||||
module go.etcd.io/etcd/raft/v3
|
||||
|
||||
go 1.19
|
||||
go 1.20
|
||||
|
||||
require (
|
||||
github.com/cockroachdb/datadriven v1.0.2
|
||||
|
@ -110,7 +110,7 @@ type Transport struct {
|
||||
Raft Raft // raft state machine, to which the Transport forwards received messages and reports status
|
||||
Snapshotter *snap.Snapshotter
|
||||
ServerStats *stats.ServerStats // used to record general transportation statistics
|
||||
// used to record transportation statistics with followers when
|
||||
// LeaderStats is used to record transportation statistics with followers when
|
||||
// performing as leader in raft protocol
|
||||
LeaderStats *stats.LeaderStats
|
||||
// ErrorC is used to report detected critical errors, e.g.,
|
||||
|
@ -1,6 +1,6 @@
|
||||
module go.etcd.io/etcd/server/v3
|
||||
|
||||
go 1.19
|
||||
go 1.20
|
||||
|
||||
require (
|
||||
github.com/coreos/go-semver v0.3.0
|
||||
|
@ -1,6 +1,6 @@
|
||||
module go.etcd.io/etcd/tests/v3
|
||||
|
||||
go 1.19
|
||||
go 1.20
|
||||
|
||||
replace (
|
||||
go.etcd.io/etcd/api/v3 => ../api
|
||||
|
@ -1,6 +1,6 @@
|
||||
module go.etcd.io/etcd/tools/v3
|
||||
|
||||
go 1.19
|
||||
go 1.20
|
||||
|
||||
require (
|
||||
github.com/akhenakh/hunspellgo v0.0.0-20160221122622-9db38fa26e19 // indirect
|
||||
|
Loading…
Reference in New Issue
Block a user