From 08b43deb3b64dae4b5bdb28182441146667dc176 Mon Sep 17 00:00:00 2001
From: ioito <qu_xuan@icloud.com>
Date: Fri, 30 Dec 2022 16:04:34 +0800
Subject: [PATCH] fix(region): system disk storage type

---
 go.mod             | 2 +-
 go.sum             | 9 ++-------
 vendor/modules.txt | 6 +-----
 3 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/go.mod b/go.mod
index de5b240ae1..aa6e4e2020 100644
--- a/go.mod
+++ b/go.mod
@@ -81,7 +81,7 @@ require (
 	k8s.io/client-go v0.19.3
 	k8s.io/cluster-bootstrap v0.19.3
 	moul.io/http2curl/v2 v2.3.0
-	yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20221229085514-f638f0e0d34b
+	yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20221229085549-47587213fcd9
 	yunion.io/x/executor v0.0.0-20211018100936-39a2cd966656
 	yunion.io/x/jsonutils v1.0.1-0.20220819091305-3bab322ab4fd
 	yunion.io/x/log v1.0.0
diff --git a/go.sum b/go.sum
index ad924da3d9..ce47c4785d 100644
--- a/go.sum
+++ b/go.sum
@@ -1158,13 +1158,8 @@ sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK
 sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
 sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q=
 sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
-<<<<<<< HEAD
-yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20221229070505-ae65734e2b17 h1:P+78a2HDY6HC6iu9hi1cerBlqQRNPDlUmnxI0S9e1LY=
-yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20221229070505-ae65734e2b17/go.mod h1:yEMFtIKPyIdIfPzsw7oTcH41JXc8G5StUAQw3ZoGj5I=
-=======
-yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20221229085514-f638f0e0d34b h1:FOm2nMJ8ljQuvFSFADeQRaX86SuoENGqjWI8LlM/dqo=
-yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20221229085514-f638f0e0d34b/go.mod h1:yEMFtIKPyIdIfPzsw7oTcH41JXc8G5StUAQw3ZoGj5I=
->>>>>>> fix(region): qcloud cdn create
+yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20221229085549-47587213fcd9 h1:Y6moP8ZQjVFVBiNvGFHjxcp8OjYOZG5KTdI7Zz7PWdw=
+yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20221229085549-47587213fcd9/go.mod h1:yEMFtIKPyIdIfPzsw7oTcH41JXc8G5StUAQw3ZoGj5I=
 yunion.io/x/executor v0.0.0-20211018100936-39a2cd966656 h1:0zlZD5uhZoIHgLVAWCz2aHaYk2ZrNsACCYD7R6EIBII=
 yunion.io/x/executor v0.0.0-20211018100936-39a2cd966656/go.mod h1:Uxuou9WQIeJXNpy7t2fPLL0BYLvLiMvGQwY7Qc6aSws=
 yunion.io/x/jsonutils v0.0.0-20190625054549-a964e1e8a051/go.mod h1:4N0/RVzsYL3kH3WE/H1BjUQdFiWu50JGCFQuuy+Z634=
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 1b1d5f1f33..e0013be4f9 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -1439,11 +1439,7 @@ sigs.k8s.io/structured-merge-diff/v4/value
 # sigs.k8s.io/yaml v1.2.0
 ## explicit; go 1.12
 sigs.k8s.io/yaml
-<<<<<<< HEAD
-# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20221229070505-ae65734e2b17
-=======
-# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20221229085514-f638f0e0d34b
->>>>>>> fix(region): qcloud cdn create
+# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20221229085549-47587213fcd9
 ## explicit; go 1.18
 yunion.io/x/cloudmux/pkg/apis
 yunion.io/x/cloudmux/pkg/apis/billing