You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cloudstack.apache.org by we...@apache.org on 2022/09/16 18:42:48 UTC

[cloudstack] 01/01: Merge remote-tracking branch 'apache/main' into 4.18-vm-autoscaling

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

weizhou pushed a commit to branch 4.18-vm-autoscaling
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit dd9c9b5e33945592ef557e590882955dfd2e7263
Merge: fe73e521f0c bbc12605767
Author: Wei Zhou <we...@apache.org>
AuthorDate: Fri Sep 16 20:42:30 2022 +0200

    Merge remote-tracking branch 'apache/main' into 4.18-vm-autoscaling

 .../java/com/cloud/user/ResourceLimitService.java  |  17 +-
 .../ResourceReservation.java}                      |  25 +-
 .../template/LocalTemplateDownloaderTest.java      |   6 +-
 .../cloudstack/reservation/ReservationVO.java      |  90 ++++
 .../cloudstack/reservation/dao/ReservationDao.java |  20 +-
 .../reservation/dao/ReservationDaoImpl.java        |  75 +++
 .../spring-engine-schema-core-daos-context.xml     |   1 +
 .../resources/META-INF/db/schema-41710to41800.sql  |  12 +
 .../cloud/resourcelimit/CheckedReservation.java    | 134 ++++++
 .../resourcelimit/ResourceLimitManagerImpl.java    |  65 +--
 .../main/java/com/cloud/vm/UserVmManagerImpl.java  | 508 +++++++++++----------
 .../resourcelimit/CheckedReservationTest.java      | 102 +++++
 .../cloud/vpc/MockResourceLimitManagerImpl.java    |   7 +
 .../smoke/test_deploy_vms_in_parallel.py           | 172 +++++++
 ui/src/components/widgets/Console.vue              |  11 +-
 15 files changed, 948 insertions(+), 297 deletions(-)