This is an automated email from the ASF dual-hosted git repository.
rohit pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.
from c49807f Merge remote-tracking branch 'origin/4.11'
add 5a046e2 systemvmtemplate: new 4.11.2 template and fixes (#2799)
new e559154 Merge remote-tracking branch 'origin/4.11'
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/DatabaseUpgradeChecker.java | 12 +-
.../com/cloud/upgrade/dao/Upgrade41100to41110.java | 183 +--------------------
...e41100to41110.java => Upgrade41110to41120.java} | 172 ++++++-------------
...e41110to41200.java => Upgrade41120to41200.java} | 8 +-
...41to442.sql => schema-41110to41120-cleanup.sql} | 3 +-
...10to420-cleanup.sql => schema-41110to41120.sql} | 12 +-
...cleanup.sql => schema-41120to41200-cleanup.sql} | 2 +-
...ma-41110to41200.sql => schema-41120to41200.sql} | 2 +-
.../cloud/upgrade/DatabaseUpgradeCheckerTest.java | 11 +-
.../debian/opt/cloud/bin/setup/cloud-early-config | 17 +-
systemvm/debian/opt/cloud/bin/setup/common.sh | 16 +-
systemvm/debian/opt/cloud/bin/setup/postinit.sh | 39 ++---
systemvm/debian/opt/cloud/bin/setup/router.sh | 63 ++++---
systemvm/debian/opt/cloud/bin/setup/vpcrouter.sh | 1 +
.../systemvmtemplate/scripts/apt_upgrade.sh | 4 +-
15 files changed, 133 insertions(+), 412 deletions(-)
copy
engine/schema/src/main/java/com/cloud/upgrade/dao/{Upgrade41100to41110.java =>
Upgrade41110to41120.java} (68%)
rename
engine/schema/src/main/java/com/cloud/upgrade/dao/{Upgrade41110to41200.java =>
Upgrade41120to41200.java} (89%)
copy engine/schema/src/main/resources/META-INF/db/{schema-441to442.sql =>
schema-41110to41120-cleanup.sql} (94%)
copy engine/schema/src/main/resources/META-INF/db/{schema-410to420-cleanup.sql
=> schema-41110to41120.sql} (57%)
rename
engine/schema/src/main/resources/META-INF/db/{schema-41110to41200-cleanup.sql
=> schema-41120to41200-cleanup.sql} (95%)
rename engine/schema/src/main/resources/META-INF/db/{schema-41110to41200.sql
=> schema-41120to41200.sql} (97%)