Skip to content

Commit

Permalink
DEPS: bump raft (cherry-pick etcd-io/raft#81)
Browse files Browse the repository at this point in the history
Had to leave out the test, but we'll exercise it through the CRDB-level unit
test added in the next commit.
  • Loading branch information
tbg committed Jul 18, 2023
1 parent 5d70dc7 commit 01e9e76
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions DEPS.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -8871,10 +8871,10 @@ def go_deps():
],
build_file_proto_mode = "default",
importpath = "go.etcd.io/etcd/raft/v3",
sha256 = "b709e2a23739ad5516fdc6c2f9ed53dfc0b07d8c604d28f72b1120e5df66c980",
strip_prefix = "github.com/cockroachdb/etcd/raft/[email protected]20230713102455-f61509e7f127",
sha256 = "2f3aedf52b904dd9450076bd1edc75e398fe48412bbd9bc2b527da0bdae6b498",
strip_prefix = "github.com/cockroachdb/etcd/raft/[email protected]20230718104326-dbe02a550754",
urls = [
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/etcd/raft/v3/com_github_cockroachdb_etcd_raft_v3-v3.0.0-20230713102455-f61509e7f127.zip",
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/etcd/raft/v3/com_github_cockroachdb_etcd_raft_v3-v3.0.0-20230718104326-dbe02a550754.zip",
],
)
go_repository(
Expand Down
2 changes: 1 addition & 1 deletion build/bazelutil/distdir_files.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ DISTDIR_FILES = {
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/crlfmt/com_github_cockroachdb_crlfmt-v0.0.0-20210128092314-b3eff0b87c79.zip": "452219ca74191eedc6f44a5088b5d64e6f75168b438ac9eafe2256b0db8dbcad",
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/datadriven/com_github_cockroachdb_datadriven-v1.0.1.zip": "0f8fe6199b1c7c44cbd4ce9ac0f3f9e1d2f02263f409361e49445fad4a410ab8",
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/errors/com_github_cockroachdb_errors-v1.9.0.zip": "ff3814544271799c80da14dadfe408efc4f66e02cbdf17b73e81614ed9f7ae43",
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/etcd/raft/v3/com_github_cockroachdb_etcd_raft_v3-v3.0.0-20230713102455-f61509e7f127.zip": "b709e2a23739ad5516fdc6c2f9ed53dfc0b07d8c604d28f72b1120e5df66c980",
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/etcd/raft/v3/com_github_cockroachdb_etcd_raft_v3-v3.0.0-20230718104326-dbe02a550754.zip": "2f3aedf52b904dd9450076bd1edc75e398fe48412bbd9bc2b527da0bdae6b498",
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/go-test-teamcity/com_github_cockroachdb_go_test_teamcity-v0.0.0-20191211140407-cff980ad0a55.zip": "bac30148e525b79d004da84d16453ddd2d5cd20528e9187f1d7dac708335674b",
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/google-api-go-client/com_github_cockroachdb_google_api_go_client-v0.80.1-0.20221117193156-6a9f7150cb93.zip": "b3378c579f4f4340403038305907d672c86f615f8233118a8873ebe4229c4f39",
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/gostdlib/com_github_cockroachdb_gostdlib-v1.13.0.zip": "b3d43d8f95edf65f73a5348f29e1159823cac64b148f8d3bb48340bf55d70872",
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@ replace go.etcd.io/etcd/pkg/v3 => go.etcd.io/etcd/pkg/v3 v3.0.0-20201109164711-0

// Use the CRDB fork of etcd/raft, at crdb-release-22.2 branch which includes
// cherry-picked fixes for this release.
replace go.etcd.io/etcd/raft/v3 => github.com/cockroachdb/etcd/raft/v3 v3.0.0-20230713102455-f61509e7f127
replace go.etcd.io/etcd/raft/v3 => github.com/cockroachdb/etcd/raft/v3 v3.0.0-20230718104326-dbe02a550754

replace github.com/docker/docker => github.com/moby/moby v20.10.6+incompatible

Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -458,8 +458,8 @@ github.com/cockroachdb/errors v1.8.1/go.mod h1:qGwQn6JmZ+oMjuLwjWzUNqblqk0xl4CVV
github.com/cockroachdb/errors v1.8.8/go.mod h1:z6VnEL3hZ/2ONZEvG7S5Ym0bU2AqPcEKnIiA1wbsSu0=
github.com/cockroachdb/errors v1.9.0 h1:B48dYem5SlAY7iU8AKsgedb4gH6mo+bDkbtLIvM/a88=
github.com/cockroachdb/errors v1.9.0/go.mod h1:vaNcEYYqbIqB5JhKBhFV9CneUqeuEbB2OYJBK4GBNYQ=
github.com/cockroachdb/etcd/raft/v3 v3.0.0-20230713102455-f61509e7f127 h1:QT4p0mJ4sV3vnBAeuRUwFN0wu+FL4C0d3uK+87v3xvA=
github.com/cockroachdb/etcd/raft/v3 v3.0.0-20230713102455-f61509e7f127/go.mod h1:KahI8w9l6cp+9Mu9A/oFq78Iiy+aGsooJpVK/Fspyhc=
github.com/cockroachdb/etcd/raft/v3 v3.0.0-20230718104326-dbe02a550754 h1:oyyjXJmG9Eqyr33rgml3ov/6r1R0uLuIAYIZHRE1QJg=
github.com/cockroachdb/etcd/raft/v3 v3.0.0-20230718104326-dbe02a550754/go.mod h1:KahI8w9l6cp+9Mu9A/oFq78Iiy+aGsooJpVK/Fspyhc=
github.com/cockroachdb/go-test-teamcity v0.0.0-20191211140407-cff980ad0a55 h1:YqzBA7tf8Gv8Oz0BbBsPenqkyjiohS7EUIwi7p1QJCU=
github.com/cockroachdb/go-test-teamcity v0.0.0-20191211140407-cff980ad0a55/go.mod h1:QqVqNIiRhLqJXif5C9wbM4JydBhrAF2WDMxkv5xkyxQ=
github.com/cockroachdb/google-api-go-client v0.80.1-0.20221117193156-6a9f7150cb93 h1:4OctRhiOrTL8zT3udFWOyb2DNIipaGawQudxVt4wcdQ=
Expand Down
2 changes: 1 addition & 1 deletion vendor

0 comments on commit 01e9e76

Please sign in to comment.