You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cloudstack.apache.org by nv...@apache.org on 2021/11/10 16:16:23 UTC

[cloudstack] 01/02: Merge branch '4.16' into main

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

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

commit b0bf069bcf31dd94a2a60d41b07c2570f6d06403
Merge: 3f79436 bdab514
Author: nicolas <ni...@gmail.com>
AuthorDate: Wed Nov 10 12:59:28 2021 -0300

    Merge branch '4.16' into main

 debian/changelog                                   |  6 ++
 engine/schema/pom.xml                              |  4 +-
 .../com/cloud/upgrade/DatabaseUpgradeChecker.java  |  2 +
 .../upgrade/SystemVmTemplateRegistration.java      | 28 +++++--
 .../com/cloud/upgrade/dao/Upgrade41600to41610.java | 87 ++++++++++++++++++++++
 .../META-INF/db/schema-41600to41610-cleanup.sql    | 20 +++++
 .../resources/META-INF/db/schema-41600to41610.sql  | 20 +++++
 tools/checkstyle/pom.xml                           |  2 +-
 tools/docker/Dockerfile                            |  2 +-
 tools/docker/Dockerfile.marvin                     |  2 +-
 tools/marvin/setup.py                              |  2 +-
 11 files changed, 164 insertions(+), 11 deletions(-)