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 6634382f6930d6389ffa095e0da252e4265dddea
Merge: 51a0864 186ac69
Author: Rohit Yadav <[email protected]>
AuthorDate: Fri Feb 19 15:30:21 2021 +0530

    Merge remote-tracking branch 'origin/4.15'
    
    Signed-off-by: Rohit Yadav <[email protected]>

 .../api/response/VMSnapshotResponse.java           | 36 +++++++++++++++----
 .../kvm/resource/LibvirtComputingResource.java     | 33 +++++++++++++++++
 .../wrapper/LibvirtMigrateCommandWrapper.java      |  8 +++++
 .../org/apache/cloudstack/utils/qemu/QemuImg.java  | 23 +++++++++++-
 .../main/java/com/cloud/api/ApiResponseHelper.java |  5 ++-
 .../com/cloud/storage/VolumeApiServiceImpl.java    |  6 ++++
 .../main/java/com/cloud/vm/UserVmManagerImpl.java  |  2 +-
 ui/nginx.conf                                      | 30 ----------------
 ui/package-lock.json                               | 41 ++++++++++++++--------
 ui/package.json                                    |  8 ++---
 ui/src/views/infra/network/IpRangesTabPublic.vue   |  2 +-
 11 files changed, 135 insertions(+), 59 deletions(-)


Reply via email to