Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[3.5] Backport update to golang 1.20 minor release #16401

Merged
merged 2 commits into from
Aug 17, 2023
Merged

[3.5] Backport update to golang 1.20 minor release #16401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9c7c8c6
Backport update to golang 1.20 minor release.
jmhbnz Aug 11, 2023
f62a894
Fix goword failure in rafthttp/transport.go.
jmhbnz Aug 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .go-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.19.12
1.20.7
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion api/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion client/pkg/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion client/v2/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion client/v3/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion etcdctl/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion etcdutl/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.etcd.io/etcd/v3

go 1.19
go 1.20

replace (
go.etcd.io/etcd/api/v3 => ./api
Expand Down
2 changes: 1 addition & 1 deletion pkg/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion raft/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion server/etcdserver/api/rafthttp/transport.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.,
Expand Down
2 changes: 1 addition & 1 deletion server/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion tools/mod/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down