Skip to content

Commit d962926

Browse files
committed
resolve conflict with latest tke sdk
1 parent 2f7f1e3 commit d962926

File tree

4 files changed

+11
-8
lines changed

4 files changed

+11
-8
lines changed

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ require (
4646
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.860
4747
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.544
4848
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.860
49-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.916
49+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.917
5050
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.624
5151
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cwp v1.0.762
5252
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.0.692
@@ -91,7 +91,7 @@ require (
9191
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tdmq v1.0.825
9292
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tem v1.0.578
9393
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.0.758
94-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.916
94+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.917
9595
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/trocket v1.0.756
9696
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tse v1.0.857
9797
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tsf v1.0.674

go.sum

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -924,10 +924,12 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.860/go.mod
924924
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.873/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
925925
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.888 h1:FqVcZ+POUhckq6ZRlwOR819fsXp49YyizpmWZJYAAGg=
926926
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.888/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
927-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.916 h1:30u2fFUGxaPB0VFpVtomiziXATxm/MjG53HCobM8KGI=
928-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.916/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
929927
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.910 h1:u+rAnHhLixQaNYy8vtnuClj4kYWs77VAHEbi9jl8k/4=
930928
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.910/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
929+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.916 h1:30u2fFUGxaPB0VFpVtomiziXATxm/MjG53HCobM8KGI=
930+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.916/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
931+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.917 h1:c3d6bUxtkYt/gS0oXd5bQmJHdJmCsXY29/v4AJFYHwY=
932+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.917/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
931933
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/csip v1.0.860 h1:F3esKBIT3HW9+7Gt8cVgf8X06VdGIczpgLBUECzSEzU=
932934
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/csip v1.0.860/go.mod h1:NZo1WplQcC314kMlCRUoy8NQju2BnolIJj7NAWgsuhY=
933935
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.624 h1:nEZqsoqt1pEoaP9JjkHQy3/H00suCfzlHW1qOm2nYD8=
@@ -1028,6 +1030,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.807 h1:/ziV4FF
10281030
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.807/go.mod h1:uRsVm3rUbE/YH4+G8o1Ppyl4ENtbLWliUxPk1yDr95k=
10291031
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.916 h1:/ERZ1hNzLfbtvOqjydV9291yC/try3gSJGsrnmT36Xs=
10301032
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.916/go.mod h1:fhRshMGZ9Y+yDte3knOAlXhUQApfhhq5reebRFHi6VA=
1033+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.917 h1:DQdeS+amOeX3eGL2eOkxrWnI4DJ6fDboJthCSXqJJ1w=
1034+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.917/go.mod h1:lJJEiqPt7CDVIVcZrU9XSD6MMEY7vhfI5pY/ccCBY3w=
10311035
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/trocket v1.0.756 h1:89M6uA8Y/FC1b88TFxvRManGW+i62Isqg1lW8HjHDvU=
10321036
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/trocket v1.0.756/go.mod h1:AJAItBOTaarpDpUF7pNp0tuz2Y6H2oFuMcyKouPs1IE=
10331037
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tse v1.0.857 h1:TkJnvSeRSXsRCwOwcwXSvruSK9s/kw8LC3FLeccw+A0=

vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/http/request.go

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/modules.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1160,7 +1160,7 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit/v20190319
11601160
# github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.860
11611161
## explicit; go 1.14
11621162
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls/v20201016
1163-
# github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.916
1163+
# github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.917
11641164
## explicit; go 1.11
11651165
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common
11661166
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors
@@ -1309,7 +1309,7 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tem/v20210701
13091309
# github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.0.758
13101310
## explicit; go 1.14
13111311
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo/v20220901
1312-
# github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.916
1312+
# github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.917
13131313
## explicit; go 1.14
13141314
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke/v20180525
13151315
# github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/trocket v1.0.756

0 commit comments

Comments
 (0)