Skip to content

Commit

Permalink
Merge #117614
Browse files Browse the repository at this point in the history 
117614: go.mod: bump etcd-io/raft to f1c02c9 r=erikgrinaker a=erikgrinaker

In particular, this pulls in etcd-io/raft@d87942f5. Changes:

```
d87942f 2023-11-17: Accept any snapshot that allows replication [Erik Grinaker] (origin/accept-more-raft-snaps, accept-more-raft-snaps)
5e2260f 2023-11-17: Document leader ignoring valid MsgAppResp from follower after snapshot [Erik Grinaker]
bbc577c 2023-12-19: owners: update username [Pavel Kalinnikov]
bfe6059 2023-12-18: build(deps): bump github/codeql-action from 2 to 3 [dependabot[bot]]
7e5fa79 2023-12-13: Added a new line at the end of gh-workflow-approve.yaml [Benjamin Wang]
f0f4add 2023-12-11: github workflow: enable workflow approval [Yashasvi Kundu]
4a6476d 2023-12-11: build(deps): bump actions/setup-go from 4 to 5 [dependabot[bot]]
4fcf99f 2023-12-03: chore: Rename prs to trk [ystkfujii]
fbbe39f 2023-12-06: Set golangci lint version to 1.55.2 [Ivan Valdes]
4d702f5 2023-12-06: Update go to 1.21.5 [Ivan Valdes]
503dd0c 2023-11-13: etcd: upgrade go version from 1.21.3 to 1.21.4 [arjunmalhotra1]
bff6788 2023-10-18: Complete migration to owners file. [James Blair]
b80cab2 2023-10-11: build(deps): bump golang.org/x/net from 0.7.0 to 0.17.0 in /tools/mod [dependabot[bot]]
06214a7 2023-09-18: Added OWNERS file for raft Co-authored-by: James Blair <[email protected]> [=]
86deb8c 2023-09-13: Update to go1.21.1 [Allen Ray]
26704a8 2023-09-04: build(deps): bump actions/checkout from 3 to 4 [dependabot[bot]]
c7b3b6f 2023-08-23: Update to golang 1.20 minor release. [James Blair]
40c2e76 2023-08-06: Update protoc from 3.14.0 to 3.20.3. [James Blair]
7ee8a81 2023-08-06: Fix lint errors. [James Blair]
2868941 2023-08-06: Update golangci-lint from 1.49.0 to 1.53.3. [James Blair]
661d398 2023-08-06: Updated go to latest patch release 1.19.12. [James Blair]
f22c0b9 2023-07-25: remove redundant joint config check [Erik Grinaker] (origin/remove-redundant-joint-check, remove-redundant-joint-check)
0ae68ec 2023-07-18: Retire `@tbg` [Tobias Grieger]
fe7caf3 2023-07-21: Add REVIEWER `@pavelkalinnikov` [Tobias Grieger]
```

Resolves #106813.
Resolves #114349.
Epic: none
Release note: None

Co-authored-by: Erik Grinaker <[email protected]>
  • Loading branch information
@erikgrinaker
craig[bot] and erikgrinaker committed Jan 10, 2024
2 parents 7f2ae6c + 4d1263e commit 60092e0
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions DEPS.bzl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10635,10 +10635,10 @@ def go_deps():
],
build_file_proto_mode = "default",
importpath = "go.etcd.io/raft/v3",
sha256 = "292954320a69953ac8366cd7a83e4a50b1cfd858643a4cdf9947ab9607f1a142",
strip_prefix = "go.etcd.io/raft/[email protected]20230717153924-72a6e6c9f3ee",
sha256 = "8f70181a01633dda91a5c65f23fff75fdcc99e5b9ac1bb787963f6eb08f163e5",
strip_prefix = "go.etcd.io/raft/[email protected]20240110140044-f1c02c9909c0",
urls = [
"https://storage.googleapis.com/cockroach-godeps/gomod/go.etcd.io/raft/v3/io_etcd_go_raft_v3-v3.0.0-20230717153924-72a6e6c9f3ee.zip",
"https://storage.googleapis.com/cockroach-godeps/gomod/go.etcd.io/raft/v3/io_etcd_go_raft_v3-v3.0.0-20240110140044-f1c02c9909c0.zip",
],
)
go_repository(
Expand Down
2 changes: 1 addition & 1 deletion build/bazelutil/distdir_files.bzl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1028,7 +1028,7 @@ DISTDIR_FILES = {
"https://storage.googleapis.com/cockroach-godeps/gomod/go.etcd.io/etcd/client/pkg/v3/io_etcd_go_etcd_client_pkg_v3-v3.5.0.zip": "c0ca209767c5734c6ed023888ba5be02aab5bd3c4d018999467f2bfa8bf65ee3",
"https://storage.googleapis.com/cockroach-godeps/gomod/go.etcd.io/etcd/client/v2/io_etcd_go_etcd_client_v2-v2.305.0.zip": "91fcb507fe8c193844b56bfb6c8741aaeb6ffa11ee9043de2af0f141173679f3",
"https://storage.googleapis.com/cockroach-godeps/gomod/go.etcd.io/etcd/io_etcd_go_etcd-v0.5.0-alpha.5.0.20200910180754-dd1b699fc489.zip": "d982ee501979b41b68625693bad77d15e4ae79ab9d0eae5f6028205f96a74e49",
"https://storage.googleapis.com/cockroach-godeps/gomod/go.etcd.io/raft/v3/io_etcd_go_raft_v3-v3.0.0-20230717153924-72a6e6c9f3ee.zip": "292954320a69953ac8366cd7a83e4a50b1cfd858643a4cdf9947ab9607f1a142",
"https://storage.googleapis.com/cockroach-godeps/gomod/go.etcd.io/raft/v3/io_etcd_go_raft_v3-v3.0.0-20240110140044-f1c02c9909c0.zip": "8f70181a01633dda91a5c65f23fff75fdcc99e5b9ac1bb787963f6eb08f163e5",
"https://storage.googleapis.com/cockroach-godeps/gomod/go.mongodb.org/mongo-driver/org_mongodb_go_mongo_driver-v1.5.1.zip": "446cff132e82c64af7ffcf48e268eb16ec81f694914aa6baecb06cbbae1be0d7",
"https://storage.googleapis.com/cockroach-godeps/gomod/go.mozilla.org/pkcs7/org_mozilla_go_pkcs7-v0.0.0-20200128120323-432b2356ecb1.zip": "3c4c1667907ff3127e371d44696326bad9e965216d4257917ae28e8b82a9e08d",
"https://storage.googleapis.com/cockroach-godeps/gomod/go.opencensus.io/io_opencensus_go-v0.24.0.zip": "203a767d7f8e7c1ebe5588220ad168d1e15b14ae70a636de7ca9a4a88a7e0d0c",
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ require (
github.com/xdg-go/stringprep v1.0.4
github.com/zabawaba99/go-gitignore v0.0.0-20200117185801-39e6bddfb292
gitlab.com/golang-commonmark/markdown v0.0.0-20211110145824-bf3e522c626a
go.etcd.io/raft/v3 v3.0.0-20230717153924-72a6e6c9f3ee
go.etcd.io/raft/v3 v3.0.0-20240110140044-f1c02c9909c0
go.opentelemetry.io/otel v1.3.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.3.0
go.opentelemetry.io/otel/exporters/zipkin v1.0.0-RC3
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2331,8 +2331,8 @@ go.etcd.io/etcd v0.5.0-alpha.5.0.20200910180754-dd1b699fc489/go.mod h1:yVHk9ub3C
go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs=
go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g=
go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ=
go.etcd.io/raft/v3 v3.0.0-20230717153924-72a6e6c9f3ee h1:7KfWqaO+jirXdEFWpwK1fa2NIm1nmBf3fP0AH6NydCk=
go.etcd.io/raft/v3 v3.0.0-20230717153924-72a6e6c9f3ee/go.mod h1:tP6U+sRzrl75ltgmFcdZg9reZVEyM3vKTxAWmwpHtB8=
go.etcd.io/raft/v3 v3.0.0-20240110140044-f1c02c9909c0 h1:tP1kfn9haDROvwd3VdalJptBM4PSVGI/5UXqEVDD3Qw=
go.etcd.io/raft/v3 v3.0.0-20240110140044-f1c02c9909c0/go.mod h1:QpxpKeYmocQQFHP75LxNrdJTukZmqQig9lotwYLsUJY=
go.mongodb.org/mongo-driver v1.0.3/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
go.mongodb.org/mongo-driver v1.1.1/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
go.mongodb.org/mongo-driver v1.1.2/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
Expand Down

0 comments on commit 60092e0

Please sign in to comment.