Skip to content

Commit

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

Signed-off-by: ti-chi-bot <[email protected]>
  • Loading branch information
lhy1024 authored and ti-chi-bot committed Jul 27, 2023
1 parent 2892b46 commit f9f2805
Show file tree
Hide file tree
Showing 4 changed files with 901 additions and 67 deletions.
6 changes: 6 additions & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,14 @@ require (
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/konsorten/go-windows-terminal-sequences v1.0.3 // indirect
<<<<<<< HEAD
github.com/leodido/go-urn v1.2.0 // indirect
github.com/mailru/easyjson v0.7.6 // indirect
=======
github.com/leodido/go-urn v1.2.1 // indirect
github.com/lufia/plan9stats v0.0.0-20230326075908-cb1d2100619a // indirect
github.com/mailru/easyjson v0.7.6
>>>>>>> 4db173597 (api: use easyjson and context in regions interface (#6838))
github.com/mattn/go-colorable v0.1.8 // indirect
github.com/mattn/go-isatty v0.0.12 // indirect
github.com/mattn/go-runewidth v0.0.8 // indirect
Expand Down
Loading

0 comments on commit f9f2805

Please sign in to comment.