This is an automated email from the ASF dual-hosted git repository.
dahn pushed a change to branch 4.18-dummy
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
discard dd0d05a6bbf don't merge
add 6cded7e0102 Support GNU sed apidoc for MacOS build (#7888)
add 405ef82aefd UI: Fix hide delete button for templates that are in
Installing template state (#7882)
add 78bdde9e981 AutoScaling: support Managed User Data (#7769)
add 5097d2aa8bd ui: fix creating zone with vxlan if Guest physical network
is not the last (#7801)
add db0e7a65afb server: check hostId when attach disk to a Stopped vm with
local storage (#7886)
add 0e9a19f24db ui: Fix project theme on reload or refresh (#7893)
add e4117e68d2f engine/schema: fix duplicated guest OSes in 4.18.0.0
(#7799)
add 8cb30551d58 UI: update ip ranges of shared networks (#7896)
add d87f39ad27f ui: make it clear that deletion of a volume will not
delete any snapshots (#7897)
add b37834fe759 ui: bump UI pkg version to match CloudStacks (#7894)
add 2e1c2821a82 UI: Add central project store and watch functionality
(#7900)
add 6c484c79997 don't merge
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (dd0d05a6bbf)
\
N -- N -- N refs/heads/4.18-dummy (6c484c79997)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
.../com/cloud/network/as/AutoScaleVmProfile.java | 4 +
api/src/main/java/com/cloud/storage/GuestOS.java | 2 +
.../java/org/apache/cloudstack/api/BaseCmd.java | 17 ++
.../api/command/admin/guest/AddGuestOsCmd.java | 8 +-
.../api/command/admin/guest/UpdateGuestOsCmd.java | 11 +-
.../autoscale/CreateAutoScaleVmProfileCmd.java | 15 ++
.../autoscale/UpdateAutoScaleVmProfileCmd.java | 17 ++
.../api/command/user/guest/ListGuestOsCmd.java | 14 +-
.../api/command/user/vm/DeployVMCmd.java | 26 +-
.../api/command/user/vm/ResetVMUserDataCmd.java | 16 +-
.../cloudstack/api/command/user/vm/ScaleVMCmd.java | 15 +-
.../api/command/user/vm/UpdateVMCmd.java | 14 +-
.../api/command/user/vm/UpgradeVMCmd.java | 15 +-
.../api/response/AutoScaleVmProfileResponse.java | 48 ++++
.../cloudstack/api/response/GuestOSResponse.java | 12 +
.../engine/orchestration/VolumeOrchestrator.java | 18 +-
.../com/cloud/network/as/AutoScaleVmProfileVO.java | 24 ++
.../src/main/java/com/cloud/storage/GuestOSVO.java | 14 ++
.../java/com/cloud/storage/dao/GuestOSDao.java | 13 +-
.../java/com/cloud/storage/dao/GuestOSDaoImpl.java | 78 +++++-
.../cloud/storage/dao/GuestOSHypervisorDao.java | 8 +-
.../storage/dao/GuestOSHypervisorDaoImpl.java | 8 +-
.../main/java/com/cloud/upgrade/GuestOsMapper.java | 110 ++++++++-
.../com/cloud/upgrade/dao/Upgrade41800to41810.java | 17 ++
.../resources/META-INF/db/schema-41720to41800.sql | 4 +-
.../resources/META-INF/db/schema-41800to41810.sql | 8 +
.../cloud/network/as/AutoScaleVmProfileVOTest.java | 31 +++
.../java/com/cloud/hypervisor/guru/VMwareGuru.java | 4 +-
.../java/com/cloud/api/ApiAsyncJobDispatcher.java | 6 +
server/src/main/java/com/cloud/api/ApiDBUtils.java | 2 +-
.../main/java/com/cloud/api/ApiResponseHelper.java | 15 ++
server/src/main/java/com/cloud/api/ApiServer.java | 3 +
.../com/cloud/network/as/AutoScaleManagerImpl.java | 53 ++++-
.../com/cloud/server/ManagementServerImpl.java | 49 ++--
.../src/main/java/com/cloud/vm/UserVmManager.java | 4 +
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 6 +-
.../cloudstack/vm/UnmanagedVMsManagerImpl.java | 2 +-
.../java/com/cloud/api/ApiResponseHelperTest.java | 72 ++++++
.../cloud/network/as/AutoScaleManagerImplTest.java | 75 +++++-
test/integration/smoke/test_vm_autoscaling.py | 69 ++++++
tools/apidoc/build-apidoc.sh | 8 +-
ui/package-lock.json | 2 +-
ui/package.json | 2 +-
ui/public/locales/en.json | 3 +-
ui/src/components/header/ProjectMenu.vue | 15 +-
ui/src/store/getters.js | 3 +-
ui/src/store/modules/app.js | 13 +-
ui/src/views/AutogenView.vue | 4 +-
ui/src/views/compute/AutoScaleVmProfile.vue | 92 ++++++--
ui/src/views/compute/CreateAutoScaleVmGroup.vue | 261 +++++++++++++++++++--
ui/src/views/compute/DeployVM.vue | 4 +-
ui/src/views/compute/ResetUserData.vue | 10 +-
ui/src/views/image/TemplateZones.vue | 2 +-
ui/src/views/infra/zone/ZoneWizardLaunchZone.vue | 5 +-
ui/src/views/network/CreateVlanIpRange.vue | 4 +-
ui/src/views/network/GuestIpRanges.vue | 98 ++++++++
56 files changed, 1242 insertions(+), 211 deletions(-)
