This is an automated email from the ASF dual-hosted git repository. shwstppr pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 4bdf35b7b0af61ec5ba28c6af7fb631cc1bed103 Merge: 1031c31e6aa a11fc43788e Author: Abhishek Kumar <[email protected]> AuthorDate: Sat Dec 9 12:04:21 2023 +0530 Merge remote-tracking branch 'apache/4.18' .../cloudstack/api/response/UserVmResponse.java | 4 ++-- .../KubernetesClusterUpgradeWorker.java | 2 +- .../src/main/resources/script/upgrade-kubernetes.sh | 2 +- .../com/cloud/api/query/dao/UserVmJoinDaoImpl.java | 9 ++++++++- test/integration/smoke/test_kubernetes_clusters.py | 10 +++++----- ui/public/locales/en.json | 2 ++ ui/src/config/section/infra/hosts.js | 20 ++++++++++++++++++++ ui/src/core/lazy_lib/icons_use.js | 4 ++++ ui/src/views/compute/CreateKubernetesCluster.vue | 2 +- ui/src/views/network/AclListRulesTab.vue | 12 +++++++++++- 10 files changed, 55 insertions(+), 12 deletions(-) diff --cc server/src/main/java/com/cloud/api/query/dao/UserVmJoinDaoImpl.java index 9836f1ffbb0,7f376b16f02..e5cc9ee7234 --- a/server/src/main/java/com/cloud/api/query/dao/UserVmJoinDaoImpl.java +++ b/server/src/main/java/com/cloud/api/query/dao/UserVmJoinDaoImpl.java @@@ -28,7 -27,7 +28,6 @@@ import java.util.stream.Collectors import javax.inject.Inject; - import com.cloud.vm.VirtualMachine; -import com.cloud.storage.Volume; import org.apache.cloudstack.affinity.AffinityGroupResponse; import org.apache.cloudstack.annotation.AnnotationService; import org.apache.cloudstack.annotation.dao.AnnotationDao; @@@ -59,11 -57,6 +59,12 @@@ import com.cloud.network.vpc.dao.VpcDao import com.cloud.service.ServiceOfferingDetailsVO; import com.cloud.storage.DiskOfferingVO; import com.cloud.storage.GuestOS; +import com.cloud.storage.Storage.TemplateType; +import com.cloud.storage.VnfTemplateDetailVO; +import com.cloud.storage.VnfTemplateNicVO; ++import com.cloud.storage.Volume; +import com.cloud.storage.dao.VnfTemplateDetailsDao; +import com.cloud.storage.dao.VnfTemplateNicDao; import com.cloud.user.Account; import com.cloud.user.AccountManager; import com.cloud.user.User; @@@ -77,6 -70,6 +78,7 @@@ import com.cloud.utils.db.SearchCriteri import com.cloud.utils.net.Dhcp; import com.cloud.vm.UserVmDetailVO; import com.cloud.vm.UserVmManager; ++import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachine.State; import com.cloud.vm.VmStats; import com.cloud.vm.dao.NicExtraDhcpOptionDao; diff --cc ui/public/locales/en.json index c798ed8dc0f,67351fd21b7..61fe69e7edb --- a/ui/public/locales/en.json +++ b/ui/public/locales/en.json @@@ -420,8 -403,8 +420,9 @@@ "label.bypassvlanoverlapcheck": "Bypass VLAN id/range overlap", "label.cachemode": "Write-cache type", "label.cancel": "Cancel", +"label.cancel.shutdown": "Cancel Shutdown", "label.cancelmaintenance": "Cancel maintenance", + "label.cancel.host.as.degraded": "Cancel host as degraded", "label.capacity": "Capacity", "label.capacitybytes": "Capacity bytes", "label.capacityiops": "IOPS total",
