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 691fd469eaca68d2bd3b5f5584b2207722771e97 Merge: 84eed6db72 98bc4415da Author: Rohit Yadav <[email protected]> AuthorDate: Thu Jun 16 15:17:02 2022 +0530 Merge remote-tracking branch 'origin/4.17' .../cloudstack/api/response/NicResponse.java | 24 +++++++++++ .../main/java/com/cloud/api/ApiResponseHelper.java | 11 +++++ .../com/cloud/api/query/dao/UserVmJoinDaoImpl.java | 10 +++++ test/integration/broken/test_vpc_vm_life_cycle.py | 2 +- test/integration/component/test_host_ha.py | 49 +++++++++++++++------- .../component/test_rootvolume_resize.py | 6 +-- ui/src/store/modules/user.js | 3 +- 7 files changed, 85 insertions(+), 20 deletions(-)
