Skip to content

Commit 0061cc6

Browse files
authored
Merge pull request #1221 from swordqiu/automated-cherry-pick-of-#1219-upstream-master
Automated cherry pick of #1219: fix: update vendor 20250325
2 parents cc3a496 + 0738b85 commit 0061cc6

File tree

4 files changed

+13
-5
lines changed

4 files changed

+13
-5
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ require (
3333
moul.io/http2curl/v2 v2.3.0
3434
yunion.io/x/jsonutils v1.0.1-0.20240930100528-1671a2d0d22f
3535
yunion.io/x/log v1.0.1-0.20240305175729-7cf2d6cd5a91
36-
yunion.io/x/pkg v1.10.4-0.20250321091808-805c8df74399
36+
yunion.io/x/pkg v1.10.4-0.20250324235849-27051af0af08
3737
yunion.io/x/s3cli v0.0.0-20241221171442-1c11599d28e1
3838
yunion.io/x/structarg v0.0.0-20231017124457-df4d5009457c
3939
)

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -421,8 +421,8 @@ yunion.io/x/log v0.0.0-20190514041436-04ce53b17c6b/go.mod h1:+gauLs73omeJAPlsXce
421421
yunion.io/x/log v1.0.1-0.20240305175729-7cf2d6cd5a91 h1:inY5o3LDa/zgsIZuPN0HmpzKIsu/lLgsBmMttuDPGj4=
422422
yunion.io/x/log v1.0.1-0.20240305175729-7cf2d6cd5a91/go.mod h1:LC6f/4FozL0iaAbnFt2eDX9jlsyo3WiOUPm03d7+U4U=
423423
yunion.io/x/pkg v0.0.0-20190620104149-945c25821dbf/go.mod h1:t6rEGG2sQ4J7DhFxSZVOTjNd0YO/KlfWQyK1W4tog+E=
424-
yunion.io/x/pkg v1.10.4-0.20250321091808-805c8df74399 h1:tm4mYslBe/tWKF950GSkpqKU5l7UWaYfm07zG2Tlpyo=
425-
yunion.io/x/pkg v1.10.4-0.20250321091808-805c8df74399/go.mod h1:0Bwxqd9MA3ACi119/l02FprY/o9gHahmYC2bsSbnVpM=
424+
yunion.io/x/pkg v1.10.4-0.20250324235849-27051af0af08 h1:GBX/Bb72xWWp++tClxj7PjuhZnRhzgvmLIbD3RyEUZc=
425+
yunion.io/x/pkg v1.10.4-0.20250324235849-27051af0af08/go.mod h1:0Bwxqd9MA3ACi119/l02FprY/o9gHahmYC2bsSbnVpM=
426426
yunion.io/x/s3cli v0.0.0-20241221171442-1c11599d28e1 h1:1KJ3YYinydPHpDEQRXdr/T8SYcKZ5Er+m489H+PnaQ4=
427427
yunion.io/x/s3cli v0.0.0-20241221171442-1c11599d28e1/go.mod h1:0iFKpOs1y4lbCxeOmq3Xx/0AcQoewVPwj62eRluioEo=
428428
yunion.io/x/structarg v0.0.0-20231017124457-df4d5009457c h1:QuLab2kSRECZRxo4Lo2KcYn6XjQFDGaZ1+x0pYDVVwQ=

vendor/modules.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -669,7 +669,7 @@ yunion.io/x/jsonutils
669669
## explicit; go 1.12
670670
yunion.io/x/log
671671
yunion.io/x/log/hooks
672-
# yunion.io/x/pkg v1.10.4-0.20250321091808-805c8df74399
672+
# yunion.io/x/pkg v1.10.4-0.20250324235849-27051af0af08
673673
## explicit; go 1.18
674674
yunion.io/x/pkg/appctx
675675
yunion.io/x/pkg/errors

vendor/yunion.io/x/pkg/util/streamutils/streamutils.go

Lines changed: 9 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)