This is an automated email from the ASF dual-hosted git repository. vishesh pushed a commit to branch 4.19 in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit bcbf152a052bbb22ef9b3b9543ff05fcdbde4277 Merge: 94503e687ca 983f164c57f Author: Vishesh <[email protected]> AuthorDate: Fri Jun 28 20:14:21 2024 +0530 Merge branch '4.18' into 4.19 .../java/com/cloud/vm/VirtualMachineProfile.java | 4 +++ .../java/com/cloud/resource/ResourceManager.java | 2 ++ .../com/cloud/vm/VirtualMachineProfileImpl.java | 2 ++ .../java/com/cloud/agent/manager/AgentAttache.java | 7 ++-- .../com/cloud/vm/VirtualMachineManagerImpl.java | 40 ++++++++++++++-------- .../storage/image/TemplateDataFactoryImpl.java | 3 ++ .../storage/image/store/TemplateObject.java | 8 +++++ .../CloudStackPrimaryDataStoreLifeCycleImpl.java | 2 +- .../driver/ScaleIOPrimaryDataStoreDriver.java | 2 +- .../com/cloud/resource/ResourceManagerImpl.java | 9 +++++ .../cloud/resource/MockResourceManagerImpl.java | 6 ++++ 11 files changed, 66 insertions(+), 19 deletions(-)
