Skip to content

Commit c5fa0e3

Browse files
JmPotatoti-chi-bot
authored andcommitted
This is an automated cherry-pick of tikv#10211
close tikv#10210 Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
1 parent 17478bb commit c5fa0e3

File tree

4 files changed

+16
-0
lines changed

4 files changed

+16
-0
lines changed

client/go.mod

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
module github.com/tikv/pd/client
22

3+
<<<<<<< HEAD
34
go 1.23.12
5+
=======
6+
go 1.25.6
7+
>>>>>>> a1f2017a6c (chore(go): bump Go version to 1.25.6 across modules (#10211))
48

59
require (
610
github.com/BurntSushi/toml v0.3.1

go.mod

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
module github.com/tikv/pd
22

3+
<<<<<<< HEAD
34
go 1.23.12
5+
=======
6+
go 1.25.6
7+
>>>>>>> a1f2017a6c (chore(go): bump Go version to 1.25.6 across modules (#10211))
48

59
// When you modify PD cooperatively with kvproto, this will be useful to submit the PR to PD and the PR to
610
// kvproto at the same time. You can run `go mod tidy` to make it replaced with go-mod style specification.

tests/integrations/go.mod

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
module github.com/tikv/pd/tests/integrations
22

3+
<<<<<<< HEAD
34
go 1.23.12
5+
=======
6+
go 1.25.6
7+
>>>>>>> a1f2017a6c (chore(go): bump Go version to 1.25.6 across modules (#10211))
48

59
replace (
610
github.com/tikv/pd => ../../

tools/go.mod

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
module github.com/tikv/pd/tools
22

3+
<<<<<<< HEAD
34
go 1.23.12
5+
=======
6+
go 1.25.6
7+
>>>>>>> a1f2017a6c (chore(go): bump Go version to 1.25.6 across modules (#10211))
48

59
replace (
610
github.com/tikv/pd => ../

0 commit comments

Comments
 (0)