This is an automated email from the ASF dual-hosted git repository. dahn pushed a change to branch healthcheck-main in repository https://gitbox.apache.org/repos/asf/cloudstack.git
discard 837ccc88fa0 4.21/main Health Check, please don't merge this! add f73cb5621df Refactoring retention of backup schedules (#11223) add 4d2beea7773 logger fix add 2d025bd0749 kvm: fix regression 5a52ca78ae5e165211c618525613c3d62cfd1b28 (#11342) add 1dc134a3ecf UI: Display NSX Provider only when NSX is the selected Isolation method (#11142) add 294aef5ecff Fix listCapacity sort by usage (#11316) add 7e0414354a9 Merge branch '4.19' into 4.20 add 70468a62584 Merge branch '4.20' add 712492230ae Shutdown MS maintenance jobs when finished (#11330) add 1f1e38f3a85 Support to list templates in ready state (new API parameter 'isready', similar to list ISOs) (#11343) add 0ee7c4379f2 4.21/main 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 (837ccc88fa0) \ N -- N -- N refs/heads/healthcheck-main (0ee7c4379f2) 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: agent/src/main/java/com/cloud/agent/Agent.java | 4 +- .../org/apache/cloudstack/api/ApiConstants.java | 4 + .../command/admin/resource/ListCapacityCmd.java | 6 +- .../api/command/user/backup/CreateBackupCmd.java | 19 +- .../user/backup/CreateBackupScheduleCmd.java | 6 +- .../api/command/user/iso/ListIsosCmd.java | 2 +- .../command/user/template/ListTemplatesCmd.java | 14 + .../java/org/apache/cloudstack/backup/Backup.java | 23 +- .../apache/cloudstack/backup/BackupManager.java | 36 +- .../apache/cloudstack/backup/BackupSchedule.java | 2 +- .../apache/cloudstack/backup/BackupScheduleVO.java | 8 +- .../org/apache/cloudstack/backup/BackupVO.java | 23 +- .../apache/cloudstack/backup/dao/BackupDao.java | 3 +- .../cloudstack/backup/dao/BackupDaoImpl.java | 23 +- .../resources/META-INF/db/schema-42010to42100.sql | 5 +- .../hypervisor/kvm/resource/LibvirtVMDef.java | 4 +- .../ManagementServerMaintenanceManagerImpl.java | 3 + .../api/dispatch/ParamGenericValidationWorker.java | 1 + .../java/com/cloud/network/NetworkServiceImpl.java | 1 - .../cloudstack/backup/BackupManagerImpl.java | 240 ++++++++------ .../cloudstack/backup/BackupManagerTest.java | 361 ++++++++++++++++----- ui/src/views/compute/AttachIso.vue | 4 +- ui/src/views/compute/AutoScaleVmProfile.vue | 1 + ui/src/views/compute/CreateAutoScaleVmGroup.vue | 2 + ui/src/views/compute/CreateKubernetesCluster.vue | 3 +- ui/src/views/compute/DeployVM.vue | 4 + ui/src/views/compute/DeployVnfAppliance.vue | 1 + ui/src/views/compute/EditVM.vue | 1 + ui/src/views/compute/ReinstallVm.vue | 1 + ui/src/views/compute/ResetUserData.vue | 1 + ui/src/views/compute/ScaleVM.vue | 1 + ui/src/views/compute/backup/FormSchedule.vue | 2 +- ui/src/views/infra/zone/ZoneWizardLaunchZone.vue | 13 + ui/src/views/tools/ImportUnmanagedInstance.vue | 1 + 34 files changed, 522 insertions(+), 301 deletions(-)