Skip to content

Commit

Permalink
This is an automated cherry-pick of tikv#8646
Browse files Browse the repository at this point in the history
close tikv#8643

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
  • Loading branch information
JmPotato authored and ti-chi-bot committed Sep 23, 2024
1 parent e1dbf12 commit e72a2d1
Show file tree
Hide file tree
Showing 6 changed files with 1,415 additions and 2 deletions.
57 changes: 57 additions & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,15 @@ require (
github.com/coreos/go-semver v0.3.0
github.com/docker/go-units v0.4.0
github.com/elliotchance/pie/v2 v2.1.0
<<<<<<< HEAD
github.com/gin-gonic/gin v1.9.1
github.com/go-echarts/go-echarts v1.0.0
=======
github.com/gin-contrib/cors v1.6.0
github.com/gin-contrib/gzip v0.0.1
github.com/gin-contrib/pprof v1.4.0
github.com/gin-gonic/gin v1.10.0
>>>>>>> edb43c053 (go.mod: upgrade gin-gonic/gin to v1.10.0 (#8646))
github.com/gogo/protobuf v1.3.2
github.com/google/btree v1.1.2
github.com/gorilla/mux v1.7.4
Expand All @@ -40,7 +47,11 @@ require (
github.com/sasha-s/go-deadlock v0.2.0
github.com/spf13/cobra v1.0.0
github.com/spf13/pflag v1.0.5
<<<<<<< HEAD
github.com/stretchr/testify v1.8.3
=======
github.com/stretchr/testify v1.9.0
>>>>>>> edb43c053 (go.mod: upgrade gin-gonic/gin to v1.10.0 (#8646))
github.com/swaggo/http-swagger v1.2.6
github.com/swaggo/swag v1.8.3
github.com/syndtr/goleveldb v1.0.1-0.20190318030020-c3a204f8e965
Expand Down Expand Up @@ -68,13 +79,24 @@ require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/bitly/go-simplejson v0.5.0 // indirect
github.com/breeswish/gin-jwt/v2 v2.6.4-jwt-patch // indirect
<<<<<<< HEAD
github.com/bytedance/sonic v1.9.1 // indirect
github.com/cenkalti/backoff/v4 v4.0.2 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f // indirect
github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
=======
github.com/bytedance/sonic v1.11.6 // indirect
github.com/bytedance/sonic/loader v0.1.1 // indirect
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/cloudwego/base64x v0.1.4 // indirect
github.com/cloudwego/iasm v0.2.0 // indirect
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.3 // indirect
>>>>>>> edb43c053 (go.mod: upgrade gin-gonic/gin to v1.10.0 (#8646))
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/dnephin/pflag v1.0.7 // indirect
github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4 // indirect
Expand All @@ -93,7 +115,11 @@ require (
github.com/go-openapi/swag v0.19.15 // indirect
github.com/go-playground/locales v0.14.1 // indirect
github.com/go-playground/universal-translator v0.18.1 // indirect
<<<<<<< HEAD
github.com/go-playground/validator/v10 v10.14.0 // indirect
=======
github.com/go-playground/validator/v10 v10.20.0 // indirect
>>>>>>> edb43c053 (go.mod: upgrade gin-gonic/gin to v1.10.0 (#8646))
github.com/go-resty/resty/v2 v2.6.0 // indirect
github.com/go-sql-driver/mysql v1.7.0 // indirect
github.com/goccy/go-graphviz v0.0.9 // indirect
Expand Down Expand Up @@ -132,9 +158,15 @@ require (
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/oleiade/reflections v1.0.1 // indirect
<<<<<<< HEAD
github.com/olekukonko/tablewriter v0.0.4 // indirect
github.com/pelletier/go-toml/v2 v2.0.8 // indirect
github.com/petermattis/goid v0.0.0-20231126143041-f558c26febf5 // indirect
=======
github.com/onsi/gomega v1.20.1 // indirect
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
github.com/petermattis/goid v0.0.0-20211229010228-4d14c490ee36 // indirect
>>>>>>> edb43c053 (go.mod: upgrade gin-gonic/gin to v1.10.0 (#8646))
github.com/pingcap/tipb v0.0.0-20220718022156-3e2483c20a9e // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
Expand All @@ -146,10 +178,15 @@ require (
github.com/sergi/go-diff v1.0.1-0.20180205163309-da645544ed44 // indirect
github.com/shirou/gopsutil v3.21.3+incompatible // indirect
github.com/shurcooL/httpgzip v0.0.0-20190720172056-320755c1c1b0 // indirect
<<<<<<< HEAD
github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
github.com/sirupsen/logrus v1.6.0 // indirect
github.com/soheilhy/cmux v0.1.5 // indirect
github.com/stretchr/objx v0.5.0 // indirect
=======
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/stretchr/objx v0.5.2 // indirect
>>>>>>> edb43c053 (go.mod: upgrade gin-gonic/gin to v1.10.0 (#8646))
github.com/swaggo/files v0.0.0-20210815190702-a29dd2bc99b2 // indirect
github.com/tklauser/go-sysconf v0.3.4 // indirect
github.com/tklauser/numcpus v0.2.1 // indirect
Expand All @@ -164,6 +201,7 @@ require (
go.uber.org/atomic v1.9.0 // indirect
go.uber.org/dig v1.9.0 // indirect
go.uber.org/fx v1.12.0 // indirect
<<<<<<< HEAD
go.uber.org/multierr v1.7.0 // indirect
golang.org/x/arch v0.3.0 // indirect
golang.org/x/crypto v0.17.0 // indirect
Expand All @@ -181,6 +219,25 @@ require (
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
google.golang.org/protobuf v1.31.0 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
=======
go.uber.org/multierr v1.11.0
golang.org/x/arch v0.8.0 // indirect
golang.org/x/crypto v0.23.0 // indirect
golang.org/x/image v0.18.0 // indirect
golang.org/x/mod v0.17.0 // indirect
golang.org/x/net v0.25.0 // indirect
golang.org/x/oauth2 v0.18.0 // indirect
golang.org/x/sync v0.7.0 // indirect
golang.org/x/sys v0.20.0 // indirect
golang.org/x/term v0.20.0 // indirect
golang.org/x/text v0.16.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/genproto v0.0.0-20240401170217-c3f982113cda // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240401170217-c3f982113cda // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda // indirect
google.golang.org/protobuf v1.34.1 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
>>>>>>> edb43c053 (go.mod: upgrade gin-gonic/gin to v1.10.0 (#8646))
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
gorm.io/datatypes v1.1.0 // indirect
Expand Down
Loading

0 comments on commit e72a2d1

Please sign in to comment.