forked from pingcap/tidb
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This is an automated cherry-pick of pingcap#57282
Signed-off-by: ti-chi-bot <[email protected]>
- Loading branch information
1 parent
5f4110d
commit 6c843ea
Showing
22 changed files
with
4,220 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2973,8 +2973,19 @@ def go_deps(): | |
name = "com_github_pingcap_kvproto", | ||
build_file_proto_mode = "disable_global", | ||
importpath = "github.com/pingcap/kvproto", | ||
<<<<<<< HEAD | ||
sum = "h1:ZWFeZNN+6poqqEQ3XU6M/Gw6oiNexbDD3yqIZ05GxlM=", | ||
version = "v0.0.0-20240112060601-a0e3fbb1eeee", | ||
======= | ||
sha256 = "d470ef683433f2c5bc7a1e610da44d516908d326a0341c07208af76a30f0d8a6", | ||
strip_prefix = "github.com/pingcap/[email protected]", | ||
urls = [ | ||
"http://bazel-cache.pingcap.net:8080/gomod/github.com/pingcap/kvproto/com_github_pingcap_kvproto-v0.0.0-20241113043844-e1fa7ea8c302.zip", | ||
"http://ats.apps.svc/gomod/github.com/pingcap/kvproto/com_github_pingcap_kvproto-v0.0.0-20241113043844-e1fa7ea8c302.zip", | ||
"https://cache.hawkingrei.com/gomod/github.com/pingcap/kvproto/com_github_pingcap_kvproto-v0.0.0-20241113043844-e1fa7ea8c302.zip", | ||
"https://storage.googleapis.com/pingcapmirror/gomod/github.com/pingcap/kvproto/com_github_pingcap_kvproto-v0.0.0-20241113043844-e1fa7ea8c302.zip", | ||
], | ||
>>>>>>> e234164d7cd (*: bump client-go with some regression tests (#57282)) | ||
) | ||
go_repository( | ||
name = "com_github_pingcap_log", | ||
|
@@ -3603,8 +3614,19 @@ def go_deps(): | |
name = "com_github_tikv_client_go_v2", | ||
build_file_proto_mode = "disable_global", | ||
importpath = "github.com/tikv/client-go/v2", | ||
<<<<<<< HEAD | ||
sum = "h1:lKLA4jW6wj/A15+sb901WXvGd4xvdGuGDOndtyVTV/8=", | ||
version = "v2.0.4-0.20240910032334-87841020c53e", | ||
======= | ||
sha256 = "4bc779621156c4ee6f46b57235da9c34c8ec0ee6d3be5f52e33da4c47098eeed", | ||
strip_prefix = "github.com/tikv/client-go/[email protected]", | ||
urls = [ | ||
"http://bazel-cache.pingcap.net:8080/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20241120024459-05d115b3e88b.zip", | ||
"http://ats.apps.svc/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20241120024459-05d115b3e88b.zip", | ||
"https://cache.hawkingrei.com/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20241120024459-05d115b3e88b.zip", | ||
"https://storage.googleapis.com/pingcapmirror/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20241120024459-05d115b3e88b.zip", | ||
], | ||
>>>>>>> e234164d7cd (*: bump client-go with some regression tests (#57282)) | ||
) | ||
go_repository( | ||
name = "com_github_tikv_pd_client", | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.