This is an automated email from the ASF dual-hosted git repository. sureshanaparti pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 212a4dedfcf0fd53d6a16ef44ef06502a3481d0c Merge: e9d8d79 5297b52 Author: Suresh Kumar Anaparti <[email protected]> AuthorDate: Thu Feb 10 20:56:52 2022 +0530 Merge branch '4.16' into main api/src/main/java/com/cloud/storage/GuestOS.java | 2 +- .../cloud/storage/GuestOSHypervisorMapping.java | 57 +++++ .../src/main/java/com/cloud/storage/GuestOSVO.java | 2 +- .../java/com/cloud/storage/dao/GuestOSDao.java | 1 + .../java/com/cloud/storage/dao/GuestOSDaoImpl.java | 22 +- .../cloud/storage/dao/GuestOSHypervisorDao.java | 2 + .../storage/dao/GuestOSHypervisorDaoImpl.java | 19 +- .../main/java/com/cloud/upgrade/GuestOsMapper.java | 191 ++++++++++++++++ .../com/cloud/upgrade/dao/Upgrade41400to41500.java | 238 ++++++++++++++++++++ .../com/cloud/upgrade/dao/Upgrade41500to41510.java | 139 ++++++++++++ .../com/cloud/upgrade/dao/Upgrade41510to41520.java | 13 ++ .../com/cloud/upgrade/dao/Upgrade41520to41600.java | 9 + .../com/cloud/upgrade/dao/Upgrade41600to41610.java | 9 + .../resources/META-INF/db/schema-41400to41500.sql | 243 --------------------- .../resources/META-INF/db/schema-41500to41510.sql | 96 -------- .../hypervisor/vmware/resource/VmwareResource.java | 8 + .../main/java/com/cloud/api/ApiResponseHelper.java | 2 +- .../com/cloud/server/ManagementServerImpl.java | 4 +- test/integration/plugins/test_quota.py | 25 +-- .../hypervisor/vmware/mo/VirtualMachineMO.java | 35 +++ 20 files changed, 753 insertions(+), 364 deletions(-)
