[cloudstack] branch 4.15 updated (1cfb449 -> 3f84b9a)

[ro...@apache.org]

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

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


    from 1cfb449  db: add schema upgrade from 4.15.0.0 to 4.15.1.0 (#4574)
     add 7a9d43e  test: fix listVolumes call for detach volume migration check (#4785)
     add 025b654  server: use network details from nic network (#4772)
     new 3f84b9a  Merge remote-tracking branch 'origin/4.14' into 4.15

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:
 .../main/java/com/cloud/api/ApiResponseHelper.java  | 21 ++++++++-------------
 test/integration/smoke/test_vm_life_cycle.py        |  2 +-
 2 files changed, 9 insertions(+), 14 deletions(-)

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

[ro...@apache.org]

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

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

commit 3f84b9ab4279066cadee9b3f9c59d84ae03de9f7
Merge: 1cfb449 025b654
Author: Rohit Yadav <ro...@shapeblue.com>
AuthorDate: Thu Mar 11 13:31:46 2021 +0530

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

 .../main/java/com/cloud/api/ApiResponseHelper.java  | 21 ++++++++-------------
 test/integration/smoke/test_vm_life_cycle.py        |  2 +-
 2 files changed, 9 insertions(+), 14 deletions(-)