This is an automated email from the ASF dual-hosted git repository. sureshanaparti pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 0c0254d8f57bdd2bf2c21416014a58bb6a018524 Merge: 4b7dcfa 7823868 Author: Suresh Kumar Anaparti <[email protected]> AuthorDate: Tue Dec 28 01:40:23 2021 +0530 Merge branch '4.16' into main .../cloud/api/query/dao/TemplateJoinDaoImpl.java | 7 +- .../configuration/ConfigurationManagerImpl.java | 13 ++-- .../network/element/VpcVirtualRouterElement.java | 5 +- .../main/java/com/cloud/vm/UserVmManagerImpl.java | 77 +++++++++++++--------- .../test/java/com/cloud/vm/UserVmManagerTest.java | 4 -- ui/src/config/section/image.js | 3 + ui/src/store/modules/user.js | 11 ---- ui/src/views/compute/DeployVM.vue | 4 ++ 8 files changed, 71 insertions(+), 53 deletions(-)
