This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 1e859a0e2ce8271641a1eaa5665a8297bd119d8c Merge: c7db4f4 8e31d1e Author: Rohit Yadav <[email protected]> AuthorDate: Tue Apr 27 22:20:30 2021 +0530 Merge remote-tracking branch 'origin/4.15' debian/control | 2 +- .../xenserver/resource/CitrixResourceBase.java | 2 +- server/src/main/java/com/cloud/api/ApiDBUtils.java | 8 +- .../com/cloud/api/query/dao/VolumeJoinDaoImpl.java | 16 +--- .../main/java/com/cloud/vm/UserVmManagerImpl.java | 8 +- test/integration/smoke/test_scale_vm.py | 101 ++++++++++++++++----- ui/src/components/view/DetailsTab.vue | 16 ++++ ui/src/components/view/InfoCard.vue | 17 ++++ ui/src/components/view/ListView.vue | 10 ++ ui/src/config/section/compute.js | 2 +- ui/src/views/infra/zone/PhysicalNetworksTab.vue | 26 +++++- 11 files changed, 158 insertions(+), 50 deletions(-)
