[cloudstack] branch master updated (5d6f746 -> 8903647)

[da...@apache.org]

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

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


    from 5d6f746  Merge remote-tracking branch 'origin/4.15'
     add 5df1337  ui: fix update template permission (#4744)
     add 9b1d1e6  systemvmtemplate: new template for 4.15.1 (#4793)
     add 952b242  kvm: Do not set backing file format of DATADISK in vm start/migration (#4800)
     add 0094cf4  tests: Extend wait time after interrupt (#4815) (#4866)
     add 918c3bd  Merge release branch 4.14 to 4.15
     new 8903647  Merge branch '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:
 .../com/cloud/upgrade/dao/Upgrade41500to41510.java | 179 ++++++++++++++++++++-
 .../kvm/resource/LibvirtComputingResource.java     |   6 +-
 tools/appliance/systemvmtemplate/template.json     |   4 +-
 .../views/image/UpdateTemplateIsoPermissions.vue   |   2 +-
 4 files changed, 186 insertions(+), 5 deletions(-)

[cloudstack] 01/01: Merge branch '4.15'

[da...@apache.org]

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

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

commit 89036471871ff3ea53fd6064be1b365e56ea9b76
Merge: 5d6f746 918c3bd
Author: Daan Hoogland <da...@onecht.net>
AuthorDate: Thu Mar 25 17:48:45 2021 +0100

    Merge branch '4.15'

 .../com/cloud/upgrade/dao/Upgrade41500to41510.java | 179 ++++++++++++++++++++-
 .../kvm/resource/LibvirtComputingResource.java     |   6 +-
 tools/appliance/systemvmtemplate/template.json     |   4 +-
 .../views/image/UpdateTemplateIsoPermissions.vue   |   2 +-
 4 files changed, 186 insertions(+), 5 deletions(-)