Skip to content

Commit 678079e

Browse files
authored
Merge pull request #317 from swordqiu/hotfix/qj-update-vendor-release-4.0.0-20250607
fix: update vendor release/4.0.0 20250607
2 parents e6581ca + c2df7f1 commit 678079e

File tree

7 files changed

+23
-108
lines changed

7 files changed

+23
-108
lines changed

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ require (
1919
google.golang.org/protobuf v1.35.1
2020
yunion.io/x/jsonutils v1.0.1-0.20250507052344-1abcf4f443b1
2121
yunion.io/x/log v1.0.1-0.20240305175729-7cf2d6cd5a91
22-
yunion.io/x/onecloud v0.0.0-20250606101216-2f8c719f03ea
22+
yunion.io/x/onecloud v0.0.0-20250607004225-6607ffc3f1a4
2323
yunion.io/x/pkg v1.10.4-0.20250519013345-54017bf6c1f0
2424
)
2525

@@ -120,7 +120,7 @@ require (
120120
moul.io/http2curl/v2 v2.3.0 // indirect
121121
sigs.k8s.io/structured-merge-diff/v4 v4.0.1 // indirect
122122
sigs.k8s.io/yaml v1.2.0 // indirect
123-
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250606090535-ac106c0457b3 // indirect
123+
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250529120044-ca8efb3b0df2 // indirect
124124
yunion.io/x/executor v0.0.0-20250518005516-5402e9e0bed0 // indirect
125125
yunion.io/x/s3cli v0.0.0-20241221171442-1c11599d28e1 // indirect
126126
yunion.io/x/sqlchemy v1.1.3-0.20250531010554-ce98f840b833 // indirect

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -785,8 +785,8 @@ sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK
785785
sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
786786
sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q=
787787
sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
788-
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250606090535-ac106c0457b3 h1:IOZ8LebPIt01xncjpe6ozb0ikg3F41cPH8YjkZl2zHU=
789-
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250606090535-ac106c0457b3/go.mod h1:FXxAEbdNfWXX9gjME3K2nJhkydHY5EKEUZb+RLEzVwQ=
788+
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250529120044-ca8efb3b0df2 h1:6hV5gSWYcFJAsIMVONNXKU/S0kzbrrdYWSx++RX8B4s=
789+
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250529120044-ca8efb3b0df2/go.mod h1:FXxAEbdNfWXX9gjME3K2nJhkydHY5EKEUZb+RLEzVwQ=
790790
yunion.io/x/executor v0.0.0-20250518005516-5402e9e0bed0 h1:msG4SiDSVU7CrXH06WuHlNEZXIooTcmNbfrIGHuIHBU=
791791
yunion.io/x/executor v0.0.0-20250518005516-5402e9e0bed0/go.mod h1:Uxuou9WQIeJXNpy7t2fPLL0BYLvLiMvGQwY7Qc6aSws=
792792
yunion.io/x/go-openvswitch v0.0.20240920 h1:imjK9g2EZ3IzBdNZ3UEYobJJYw6bQCvUvgoTOIyis1o=
@@ -798,8 +798,8 @@ yunion.io/x/log v0.0.0-20190514041436-04ce53b17c6b/go.mod h1:+gauLs73omeJAPlsXce
798798
yunion.io/x/log v0.0.0-20190629062853-9f6483a7103d/go.mod h1:LC6f/4FozL0iaAbnFt2eDX9jlsyo3WiOUPm03d7+U4U=
799799
yunion.io/x/log v1.0.1-0.20240305175729-7cf2d6cd5a91 h1:inY5o3LDa/zgsIZuPN0HmpzKIsu/lLgsBmMttuDPGj4=
800800
yunion.io/x/log v1.0.1-0.20240305175729-7cf2d6cd5a91/go.mod h1:LC6f/4FozL0iaAbnFt2eDX9jlsyo3WiOUPm03d7+U4U=
801-
yunion.io/x/onecloud v0.0.0-20250606101216-2f8c719f03ea h1:34nenKSP5RXw1ihdLG8rY4HA463xhVgXcHTEThHRifA=
802-
yunion.io/x/onecloud v0.0.0-20250606101216-2f8c719f03ea/go.mod h1:m6hKra639eHwBLaXRwEk23mYLilxkdT/W98db1zKL2M=
801+
yunion.io/x/onecloud v0.0.0-20250607004225-6607ffc3f1a4 h1:LhCRMFHJ3zjGolzykiJOfNVdhxpjyhApVWEQFpXe9t0=
802+
yunion.io/x/onecloud v0.0.0-20250607004225-6607ffc3f1a4/go.mod h1:pwx7ipGUYHq1Ie3nftk2PAT6eiZmIzKqaFdg8y8QCfI=
803803
yunion.io/x/pkg v0.0.0-20190620104149-945c25821dbf/go.mod h1:t6rEGG2sQ4J7DhFxSZVOTjNd0YO/KlfWQyK1W4tog+E=
804804
yunion.io/x/pkg v0.0.0-20190628082551-f4033ba2ea30/go.mod h1:t6rEGG2sQ4J7DhFxSZVOTjNd0YO/KlfWQyK1W4tog+E=
805805
yunion.io/x/pkg v1.10.4-0.20250519013345-54017bf6c1f0 h1:iKWkBMKazSijYNhOaSh4qBuIu+PmXYhEAMNwrxaXL4Q=

vendor/modules.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -724,7 +724,7 @@ sigs.k8s.io/structured-merge-diff/v4/value
724724
# sigs.k8s.io/yaml v1.2.0
725725
## explicit; go 1.12
726726
sigs.k8s.io/yaml
727-
# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250606090535-ac106c0457b3
727+
# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250529120044-ca8efb3b0df2
728728
## explicit; go 1.21
729729
yunion.io/x/cloudmux/pkg/apis
730730
yunion.io/x/cloudmux/pkg/apis/billing
@@ -747,7 +747,7 @@ yunion.io/x/jsonutils
747747
## explicit; go 1.12
748748
yunion.io/x/log
749749
yunion.io/x/log/hooks
750-
# yunion.io/x/onecloud v0.0.0-20250606101216-2f8c719f03ea
750+
# yunion.io/x/onecloud v0.0.0-20250607004225-6607ffc3f1a4
751751
## explicit; go 1.21
752752
yunion.io/x/onecloud/locales
753753
yunion.io/x/onecloud/pkg/apihelper

vendor/yunion.io/x/cloudmux/pkg/cloudprovider/resources.go

Lines changed: 0 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/yunion.io/x/cloudmux/pkg/cloudprovider/waf.go

Lines changed: 0 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/yunion.io/x/onecloud/pkg/apis/compute/waf_rules.go

Lines changed: 4 additions & 28 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/yunion.io/x/onecloud/pkg/compute/models/waf_rules.go

Lines changed: 11 additions & 63 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)