This is an automated email from the ASF dual-hosted git repository.

sureshanaparti pushed a change to branch missing-labels-nsx
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


    from f98bde83c99 UI: Fix missing labels
     add 544028ca8e6 Do not rely on Memory engine even transiently in DB setup 
scripts (#11106)
     add 3b54194aef1 Correct quota type indexes (#11085)
     add c24e4eea855 server: fix orphan db transaction issue (#11095)
     add cbd2b5a0224 Add check for ldap truststore password (#11055)
     add 7cad65d310d Merge release branch 4.19 to 4.20
     add 1a251c8b789 merge forward fix
     add ed7bd5e5804 ui: fix handler for deploy button menu (#11116)
     add 80f46ad55d6 [VMware to KVM Migration] Fix for converted instance npe 
issue when source vmware instance ovf is exported from management server 
(#11003)
     add 1cbf1cd2cd8 fix volumes search filter (#11168)
     add 49c6fbdfaf3 schema: fix missing columns index (#11171)
     add 39c8c4dbae9 Normalize naming of Kubernetes clusters (#10778)
     add e47b78b2bbb directdownload: fix keytool importcert (#11113)
     add c782835f012 [Vmware to KVM Migration] Fix issue with vCenter 
Standalone hosts for VM listing (#11091)
     add 67a1ea35f4e .github: restrict codecov in UI build to apache/cloudstack 
repo (#11158)
     add 7715b3dc298 Improve the error throws when a template to owned by a non 
root-admin is registered for all zones. (#11170)
     add 61e74e086b5 Merge branch '4.19' into 4.20
     add 9688cbb0953 systemvm: build 4.20.2 template with 'depmod -a' (#11128)
     add c94f75c7ea7 PowerFlex/ScaleIO - Wait after SDC service 
start/restart/stop, and retry to fetch SDC id/guid (#11099)
     add 06c80cdbe91 Remove unfinished usage job entries of the host (#10848)
     add 0d65c8c4543 Merge branch '4.19' into 4.20
     add 30deec89e6b kvm: consider Debian same as Ubuntu (#10917)
     add 23de6c7db4d Fix update resource count failure for domains (#11138)
     add d5f6b7cd1d1 Fix to create instances with smaller templates (< 1 GB) on 
PowerFlex/ScaleIO storage (#11211)
     add d72a05aa5ad Add special Icon to Shared FileSystem Instances (#10857)
     add 0ebf72df0f1 Handle nas backup and restore on Shared mount point. 
(#11204)
     add 1b74c2dd3f9 Fix restore from NAS backup when datadisk is older than 
the root disk. (#11258)
     add 21191fae340 Merge branch '4.20' into missing-labels-nsx

No new revisions were added by this update.

Summary of changes:
 .github/workflows/ui.yml                           |   1 +
 .../cloud/agent/properties/AgentProperties.java    |   2 +-
 .../java/com/cloud/storage/VolumeApiService.java   |   7 +
 .../com/cloud/agent/api/ConvertInstanceAnswer.java |  16 --
 .../cloud/agent/api/ConvertInstanceCommand.java    |  11 +-
 .../download/HttpsDirectTemplateDownloader.java    |  11 +-
 .../direct/download/HttpsMultiTrustManager.java    | 102 ----------
 .../com/cloud/upgrade/dao/Upgrade42000to42010.java |   2 -
 .../main/java/com/cloud/usage/dao/UsageJobDao.java |   2 +
 .../java/com/cloud/usage/dao/UsageJobDaoImpl.java  |  37 +++-
 .../cloudstack/backup/NASBackupProvider.java       |  13 +-
 .../kvm/resource/LibvirtComputingResource.java     |  11 +-
 .../LibvirtCheckConvertInstanceCommandWrapper.java |   2 +-
 .../LibvirtConvertInstanceCommandWrapper.java      | 207 +--------------------
 .../wrapper/LibvirtReadyCommandWrapper.java        |   6 +-
 .../LibvirtRestoreBackupCommandWrapper.java        |  60 +++---
 ...tupDirectDownloadCertificateCommandWrapper.java |   2 +-
 .../kvm/storage/ScaleIOStorageAdaptor.java         |  54 ++++--
 .../LibvirtConvertInstanceCommandWrapperTest.java  |  70 -------
 .../kvm/storage/ScaleIOStorageAdaptorTest.java     |   6 +-
 ...ernetesClusterResourceModifierActionWorker.java |  38 +++-
 ...tesClusterResourceModifierActionWorkerTest.java | 138 ++++++++++++++
 .../lifecycle/StorageVmSharedFSLifeCycle.java      |  25 ++-
 .../lifecycle/StorageVmSharedFSLifeCycleTest.java  |  11 +-
 .../driver/ScaleIOPrimaryDataStoreDriver.java      |  16 +-
 .../datastore/manager/ScaleIOSDCManagerImpl.java   |  14 +-
 .../datastore/provider/ScaleIOHostListener.java    |   6 +-
 .../storage/datastore/util/ScaleIOUtil.java        |  41 +++-
 .../driver/ScaleIOPrimaryDataStoreDriverTest.java  |  12 ++
 .../kvm/storage/StorPoolStorageAdaptor.java        |   3 +
 .../apache/cloudstack/ldap/LdapContextFactory.java |  40 +++-
 .../apache/cloudstack/ldap/LdapManagerImpl.java    |   5 +
 pom.xml                                            |   2 +-
 .../java/com/cloud/alert/AlertManagerImpl.java     |  32 +++-
 .../resourcelimit/ResourceLimitManagerImpl.java    | 110 ++++++-----
 .../java/com/cloud/storage/StorageManagerImpl.java |  36 ++--
 .../com/cloud/storage/VolumeApiServiceImpl.java    |  16 +-
 .../com/cloud/template/TemplateAdapterBase.java    |   3 +-
 .../cloudstack/backup/BackupManagerImpl.java       |   2 +
 .../cloudstack/vm/UnmanagedVMsManagerImpl.java     |  59 +-----
 .../cloud/storage/VolumeApiServiceImplTest.java    |   7 +-
 .../cloudstack/vm/UnmanagedVMsManagerImplTest.java |   2 -
 setup/db/create-schema.sql                         |   4 +-
 .../appliance/systemvmtemplate/scripts/finalize.sh |   1 +
 ui/src/components/view/InfoCard.vue                |   7 +-
 ui/src/components/view/ListView.vue                |   7 +-
 ui/src/components/view/SearchView.vue              |   2 +-
 ui/src/utils/quota.js                              |   4 +-
 ui/src/views/compute/DeployVM.vue                  |   4 +-
 ui/src/views/compute/DeployVnfAppliance.vue        |   4 +-
 ui/src/views/compute/wizard/DeployButtons.vue      |  47 +++--
 .../java/com/cloud/usage/UsageManagerImpl.java     |  27 ++-
 .../main/java/com/cloud/utils/net/NetUtils.java    |  22 ++-
 .../com/cloud/hypervisor/vmware/mo/BaseMO.java     |  21 ++-
 54 files changed, 672 insertions(+), 718 deletions(-)
 delete mode 100644 
core/src/main/java/org/apache/cloudstack/direct/download/HttpsMultiTrustManager.java
 create mode 100644 
plugins/integrations/kubernetes-service/src/test/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterResourceModifierActionWorkerTest.java

Reply via email to