[cloudstack] branch main updated (a9c42fd -> b955b38)

[ro...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rohit pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.


    from a9c42fd  Provide option to force delete the project (#4617)
     add 25d522f  server: add vm boot details for start vm api (#5469)
     new b955b38  Merge remote-tracking branch 'origin/4.15' into main

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../xenserver/resource/CitrixResourceBase.java     |  3 ++
 .../main/java/com/cloud/vm/UserVmManagerImpl.java  | 38 ++++++++++++++--------
 2 files changed, 28 insertions(+), 13 deletions(-)

[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.15' into main

[ro...@apache.org]

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 b955b38ccbd66c44b9a31ecbd5c8e645108b9d1e
Merge: a9c42fd 25d522f
Author: Rohit Yadav <ro...@shapeblue.com>
AuthorDate: Mon Sep 27 16:17:49 2021 +0530

    Merge remote-tracking branch 'origin/4.15' into main

 .../xenserver/resource/CitrixResourceBase.java     |  3 ++
 .../main/java/com/cloud/vm/UserVmManagerImpl.java  | 38 ++++++++++++++--------
 2 files changed, 28 insertions(+), 13 deletions(-)