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

dahn pushed a change to branch healthcheck-4.20
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


 discard 61f2c4bc2b8 4.20 Health Check, please don't merge this!
     add 89df3181648 [20.3] resource allocation
     add 4dd91feb277 [20.3] resource instance limits
     add 1593944553f [20.3] Implement/fix limit validation for projects
     add 7faa1b650b9 [20.3] resource allocation vpc
     add b025e85fc57 Check resource reservation on volume creation
     add 0edd577f4bb Fix: KVM Direct Download URL injection
     add 3b987f21afb [20.3] handle user's canned policy when a bucket is deleted
     add e0ef3a69472 Check resource reservation on volume snapshot creation
     add 06ee2fea76d Implement/fix limit validation for secondary storage
     add 4bcd509193f Fix resource limit reservation and check during 
StartVirtualMachine
     add 03dfe4d1f3e secondary storage resource limit for download
     add d0f67301579 volume download fix
     add 81a8ac8e1ff secondary storage resource limit for upload
     add 360b64ce1e3 Consider infinite resources when calculating secondary 
storage limit for upload operations
     add 0a4b4c6af05 [20.3] Address limit checks for VM, CPU, memory, volume, 
and primary storage
     add 497266270b9 Cleanup imported VM from disk on failure due to volume 
allocation + prevent duplicate volume and primary storage increment on import
     add e8f8aca694f Fix failing tests
     add dc7068a1351 Address public IP limit validations
     add d9f45477d71 4.20 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   (61f2c4bc2b8)
            \
             N -- N -- N   refs/heads/healthcheck-4.20 (d9f45477d71)

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:
 .../main/java/com/cloud/agent/api/to/BucketTO.java |   7 +
 .../java/com/cloud/projects/ProjectService.java    |   4 +-
 .../storage/VMTemplateStorageResourceAssoc.java    |   3 +-
 .../java/com/cloud/user/ResourceLimitService.java  |  19 +-
 .../user/account/AddAccountToProjectCmd.java       |   3 +-
 .../command/user/account/AddUserToProjectCmd.java  |   3 +-
 .../apache/cloudstack/resourcelimit/Reserver.java} |  16 +-
 .../command/test/AddAccountToProjectCmdTest.java   |   3 +
 .../cloud/agent/api/storage/DownloadAnswer.java    |   2 +-
 .../download/DirectTemplateDownloaderImpl.java     |  11 +-
 .../download/MetalinkDirectTemplateDownloader.java |   2 +-
 .../download/NfsDirectTemplateDownloader.java      |   2 +-
 .../command/TemplateOrVolumePostUploadCommand.java |   8 +
 .../storage/command/UploadStatusCommand.java       |  10 +
 .../service/NetworkOrchestrationService.java       |   2 +-
 .../service/VolumeOrchestrationService.java        |   2 +-
 .../com/cloud/vm/VirtualMachineManagerImpl.java    |  23 +-
 .../engine/orchestration/NetworkOrchestrator.java  |  46 ++-
 .../engine/orchestration/VolumeOrchestrator.java   |  24 +-
 .../java/com/cloud/dc/dao/AccountVlanMapDao.java   |   2 +-
 .../com/cloud/dc/dao/AccountVlanMapDaoImpl.java    |   4 +-
 .../java/com/cloud/dc/dao/DomainVlanMapDao.java    |   2 +-
 .../com/cloud/dc/dao/DomainVlanMapDaoImpl.java     |   4 +-
 .../storage/image/BaseImageStoreDriverImpl.java    |  26 +-
 .../manager/BareMetalTemplateAdapter.java          |   1 -
 .../driver/MinIOObjectStoreDriverImpl.java         |  81 +++--
 .../driver/MinIOObjectStoreDriverImplTest.java     |   7 +-
 server/src/main/java/com/cloud/api/ApiDBUtils.java |   4 +
 .../configuration/ConfigurationManagerImpl.java    |  74 ++--
 .../java/com/cloud/network/NetworkServiceImpl.java |  26 +-
 .../java/com/cloud/network/vpc/VpcManagerImpl.java |   3 +
 .../com/cloud/projects/ProjectManagerImpl.java     |  51 ++-
 .../cloud/resourcelimit/CheckedReservation.java    | 117 ++++--
 .../com/cloud/resourcelimit/ReservationHelper.java |  16 +-
 .../resourcelimit/ResourceLimitManagerImpl.java    | 186 +++++-----
 .../cloud/storage/ImageStoreUploadMonitorImpl.java | 161 +++++++--
 .../com/cloud/storage/VolumeApiServiceImpl.java    | 126 +++++--
 .../storage/download/DownloadActiveState.java      |   5 +
 .../cloud/storage/download/DownloadErrorState.java |   5 +
 .../storage/download/DownloadInactiveState.java    |   6 +
 ...edState.java => DownloadLimitReachedState.java} |  21 +-
 .../cloud/storage/download/DownloadListener.java   |  89 ++++-
 .../com/cloud/storage/download/DownloadState.java  |   6 +-
 .../storage/snapshot/SnapshotManagerImpl.java      |  34 +-
 .../cloud/template/HypervisorTemplateAdapter.java  |  41 +--
 .../com/cloud/template/TemplateAdapterBase.java    |   3 -
 .../com/cloud/template/TemplateManagerImpl.java    | 112 ++++--
 .../main/java/com/cloud/vm/UserVmManagerImpl.java  | 294 ++++++++-------
 .../cloud/vm/snapshot/VMSnapshotManagerImpl.java   |  22 +-
 .../volume/VolumeImportUnmanageManagerImpl.java    |  21 +-
 .../cloudstack/vm/UnmanagedVMsManagerImpl.java     | 173 +++++----
 .../com/cloud/network/vpc/VpcManagerImplTest.java  |   8 +-
 .../resourcelimit/CheckedReservationTest.java      |  17 +-
 .../ResourceLimitManagerImplTest.java              |  89 +----
 .../cloud/storage/VolumeApiServiceImplTest.java    |  52 ++-
 .../storage/snapshot/SnapshotManagerTest.java      |  11 +-
 .../cloud/template/TemplateManagerImplTest.java    | 402 +++------------------
 .../java/com/cloud/vm/UserVmManagerImplTest.java   |  44 +--
 .../cloud/vm/snapshot/VMSnapshotManagerTest.java   |   8 +-
 .../java/com/cloud/vpc/MockNetworkManagerImpl.java |   2 +-
 .../cloud/vpc/MockResourceLimitManagerImpl.java    |  36 +-
 .../VolumeImportUnmanageManagerImplTest.java       |   3 -
 .../cloudstack/vm/UnmanagedVMsManagerImplTest.java |  57 +--
 .../storage/resource/HttpUploadServerHandler.java  |   2 +
 .../resource/NfsSecondaryStorageResource.java      |  33 +-
 .../storage/template/DownloadManagerImpl.java      |   2 +-
 66 files changed, 1458 insertions(+), 1221 deletions(-)
 copy api/src/main/java/{com/cloud/network/rules/LoadBalancer.java => 
org/apache/cloudstack/resourcelimit/Reserver.java} (68%)
 copy api/src/main/java/com/cloud/exception/InvalidParameterValueException.java 
=> server/src/main/java/com/cloud/resourcelimit/ReservationHelper.java (72%)
 copy 
server/src/main/java/com/cloud/storage/download/{DownloadAbandonedState.java => 
DownloadLimitReachedState.java} (67%)

Reply via email to