This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 7362e5338c95cfa2dad0e3e566acd0cf47dad53d
Merge: f563c165cb3 26581b77411
Author: Rohit Yadav <rohit.ya...@shapeblue.com>
AuthorDate: Mon Aug 28 12:54:36 2023 +0530
Merge remote-tracking branch 'origin/4.18'
.../api/command/user/vm/DeployVMCmd.java | 4 ++--
.../upgrade/SystemVmTemplateRegistration.java | 28 ++++++++++++----------
.../java/com/cloud/storage/StorageManagerImpl.java | 2 +-
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 17 +++++++------
4 files changed, 28 insertions(+), 23 deletions(-)
