This is an automated email from the ASF dual-hosted git repository.
sureshanaparti pushed a change to branch healthcheck-4.22
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
discard 846dc1dbf58 4.22 Health Check, please don't merge this!
add 70489448831 [Fix] VMware to KVM migration instances listing failure
(#12766)
add 09ee0927e9b [4.22] Prevent Load Balancer rule creation when adding a
VM from a different network (#12785)
add e93ae1a4f45 New config key "allow.import.volume.with.backing.file" to
skip volume backing (#12809)
add bce55945ece Mark VMs in error state when expunge fails during destroy
operation (#12749)
add 7107d28db82 [VMware to KVM] Add guest OS for importing VM based on the
source VM OS (#12802)
add 7c3637a2f58 Fix duplicate dummy templates, and update guest os for
dummy template (#12780)
add d6c39772b21 Set management server id from cookies after saml login
(#12858)
add 84676afd5cc Check for null host before proceeding with VM volume
operations in managed storage while restoring VM (#12879)
add c1af36f8fc9 [4.22] Prevent unmanaging or reinstalling a VM if it is
part of a CKS cluster (#12800)
add e354aa19c93 4.22 Health Check, please don't merge this!
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (846dc1dbf58)
\
N -- N -- N refs/heads/healthcheck-4.22 (e354aa19c93)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
api/src/main/java/com/cloud/vm/UserVmService.java | 3 +-
api/src/main/java/com/cloud/vm/VirtualMachine.java | 3 +
.../api/command/admin/vm/ImportVmCmd.java | 12 ++
.../api/command/user/guest/ListGuestOsCmd.java | 9 ++
.../api/response/UnmanagedInstanceResponse.java | 24 ++++
.../volume/VolumeImportUnmanageService.java | 13 +-
.../apache/cloudstack/vm/UnmanagedInstanceTO.java | 19 +++
.../apache/cloudstack/vm/UnmanagedVMsManager.java | 2 +
.../java/com/cloud/storage/dao/GuestOSDao.java | 2 +-
.../java/com/cloud/storage/dao/GuestOSDaoImpl.java | 6 +-
.../main/java/com/cloud/storage/dao/VolumeDao.java | 8 ++
.../java/com/cloud/storage/dao/VolumeDaoImpl.java | 12 ++
.../com/cloud/upgrade/dao/Upgrade42200to42210.java | 51 ++++++++
.../resources/META-INF/db/schema-42200to42210.sql | 2 +
.../motion/StorageSystemDataMotionStrategy.java | 4 +-
.../wrapper/LibvirtGetRemoteVmsCommandWrapper.java | 2 +
...LibvirtGetUnmanagedInstancesCommandWrapper.java | 2 +
.../java/org/apache/cloudstack/saml/SAMLUtils.java | 3 +
.../main/java/com/cloud/api/ApiResponseHelper.java | 17 ++-
.../deploy/DeploymentPlanningManagerImpl.java | 4 +-
.../network/lb/LoadBalancingRulesManagerImpl.java | 14 ++-
.../com/cloud/server/ManagementServerImpl.java | 33 ++++--
.../src/main/java/com/cloud/vm/UserVmManager.java | 5 +
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 132 ++++++++++++++-------
.../volume/VolumeImportUnmanageManagerImpl.java | 15 ++-
.../cloudstack/vm/UnmanagedVMsManagerImpl.java | 103 ++++------------
.../java/com/cloud/vm/UserVmManagerImplTest.java | 56 +++++++++
.../cloudstack/vm/UnmanagedVMsManagerImplTest.java | 55 ++++++++-
ui/public/locales/en.json | 1 +
ui/src/permission.js | 1 +
ui/src/views/tools/ImportUnmanagedInstance.vue | 37 +++++-
ui/src/views/tools/ManageInstances.vue | 21 +++-
.../com/cloud/hypervisor/vmware/mo/BaseMO.java | 27 ++++-
.../cloud/hypervisor/vmware/util/VmwareHelper.java | 16 ++-
.../hypervisor/vmware/util/VmwareHelperTest.java | 23 ++++
35 files changed, 576 insertions(+), 161 deletions(-)
