Skip to content

Commit

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

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
  • Loading branch information
baurine authored and ti-chi-bot committed Sep 12, 2023
1 parent 113cded commit 62ce678
Show file tree
Hide file tree
Showing 4 changed files with 148 additions and 14 deletions.
16 changes: 16 additions & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,27 @@ require (
github.com/pingcap/failpoint v0.0.0-20200702092429-9f69995143ce
github.com/pingcap/kvproto v0.0.0-20230407040905-68d0eebd564a
github.com/pingcap/log v1.1.1-0.20221110025148-ca232912c9f3
<<<<<<< HEAD
github.com/pingcap/sysutil v1.0.1-0.20230407040306-fb007c5aff21
github.com/pingcap/tidb-dashboard v0.0.0-20230705095454-5e220f970f27
=======
github.com/pingcap/sysutil v0.0.0-20211208032423-041a72e5860d
github.com/pingcap/tidb-dashboard v0.0.0-20230911054332-22add1e00511
>>>>>>> e8f95acfb (chore(dashboard): update version to v2023.09.11.1 (#7065))
github.com/prometheus/client_golang v1.11.1
github.com/prometheus/common v0.26.0
github.com/sasha-s/go-deadlock v0.2.0
github.com/shirou/gopsutil/v3 v3.23.3
github.com/smallnest/chanx v0.0.0-20221229104322-eb4c998d2072
github.com/spf13/cobra v1.0.0
github.com/spf13/pflag v1.0.5
<<<<<<< HEAD
github.com/stretchr/testify v1.8.2
github.com/swaggo/http-swagger v0.0.0-20200308142732-58ac5e232fba
=======
github.com/stretchr/testify v1.7.1
github.com/swaggo/http-swagger v1.2.6
>>>>>>> e8f95acfb (chore(dashboard): update version to v2023.09.11.1 (#7065))
github.com/swaggo/swag v1.8.3
github.com/syndtr/goleveldb v1.0.1-0.20190318030020-c3a204f8e965
github.com/unrolled/render v1.0.1
Expand Down Expand Up @@ -157,9 +167,15 @@ require (
github.com/shurcooL/httpgzip v0.0.0-20190720172056-320755c1c1b0 // indirect
github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
github.com/sirupsen/logrus v1.6.0 // indirect
<<<<<<< HEAD
github.com/soheilhy/cmux v0.1.4
github.com/stretchr/objx v0.5.0 // indirect
github.com/swaggo/files v0.0.0-20190704085106-630677cd5c14 // indirect
=======
github.com/soheilhy/cmux v0.1.4 // indirect
github.com/stretchr/objx v0.2.0 // indirect
github.com/swaggo/files v0.0.0-20210815190702-a29dd2bc99b2 // indirect
>>>>>>> e8f95acfb (chore(dashboard): update version to v2023.09.11.1 (#7065))
github.com/tidwall/gjson v1.9.3 // indirect
github.com/tklauser/go-sysconf v0.3.11 // indirect
github.com/tklauser/numcpus v0.6.0 // indirect
Expand Down
Loading

0 comments on commit 62ce678

Please sign in to comment.