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

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


 discard 1bccb83  Fix migratevolume form to pick selected storage pool id in 
list diskofferings API
 discard b14efa8  Fix resize volume operation to update the VM settings
 discard 1117363  Converted from check box to toggle in scale VM, 
changeoffering, resize and migrate volume forms
 discard c998601  Make UI changes to provide root disk size box when the linked 
disk offering is of custom
 discard 3ff84b7  Fixing vue syntax error
 discard 25d8e1c  Allow only resize to higher disk size from UI
 discard 47bdcd7  Allow resize and automigrate of root volume if required in 
all cases of service offering change
 discard ec91836  Removed old foreign key constraint on IDs of service offering 
and disk offering
 discard 7c23222  Added shrinkOk flag to scaleVM and 
changeServiceForVirtualMachines and UI form
 discard 716237d  Added shrinkOk param to UI in changeOfferingforVolume form
 discard 4336afe  Added shrinkOK parameter to changeofferingforvolume API
 discard fe857f4  Addes since attributes to new API params
 discard 3a8908d  UI: Added automigrate checkbox in scale VM form
 discard 980dfbd  Added support for auto migration and auto resize of the root 
volume upon changing the service offering for VM.
 discard 592638b  Resolving merge conflicts with main 4.17
 discard ca79952  Removed DB changes from 4.16 upgrade file
 discard 7e5490e  Fix resize volume and migrate volume to update volume path if 
DRS is applied on volume in datastore cluster
 discard 0a1488c  Added search field for changeofferingforvolume UI form
 discard bfaff82  Fix false response on updateDiskOffering API
 discard 375e5ac  Added custom Iops to resize volume form and removed the 
current disk offering during change offering for volume UI form
 discard 5b52986  Fixed UI in migrate and changeofferingfor volume to handle 
empty disk offering list Removed the volume's current disk offering from 
listDiskOffering response list
 discard f976294  Fix listdiskoffering after rebasing with main
 discard 24cf1d2  UI fix in deploy vm wizard
 discard b53a99d  UI changes to disable override root disk size when override 
root disk offering is enabled
 discard 9049a9c  Fixed resize volume UI form for data disk
 discard ca29f68  Address review comments and fix UI form of deploy VM in case 
of ISO.
 discard 3c7528c  Added tool tip for migrate volume UI form
 discard 83b455c  Fix smoke test failures
 discard 8cf7f9b  Rename global configuration parameter from 
storage.pool.tags.disk.offering.strictness to 
match.storage.pool.tags.with.disk.offering
 discard e33cc3a  Added storage id for the list disk offering API and 
corresponding UI changes in migrateVolume and changeOfferingForVolume flow
 discard 6fb3fd3  Fix unit test in VolumeApiServiceImpl
 discard 5364bc6  Fixed recent unit test cases with new serviceofferingvo 
constructor
 discard e1e9408  Fix a unit test case
 discard ea6c195  Changes for override root disk offering in deployvm wizard in 
case of custom offering
 discard 956fc80  Fix list volumes, after changing system_use column from disk 
offering to service offering in volume_view
 discard 99737e2  Fix global setting implementation
 discard 05a1666  Fix changeOfferingForVolume API for custom disk offering
 discard cf6912d  update volume_view to update system_use column from service 
offering and not disk offering
 discard 4739e79  Remove system_use column from disk offering join
 discard 25607b5  review comments addressed
 discard 22eb0bc  Added marvin test cases for checking disk offering strictness
 discard 874c72d  Addressed review comments and fixed update service offering 
flow with storage tags
 discard aa24ce3  Removed unused import
 discard 95fbebf  Fix domain_router_view to get proper service offering id
 discard ca22a60  Fix service offering constructor to address custom offering
 discard 46e166c  Fix service offering edit flow
 discard 58cfe0a  Fixed service_offering_view
 discard bb4b46e  Addressed review comments
 discard 917ed34  fix user_vm_view
 discard 8345df8  Fix unit test failures
 discard 9ce50a1  Fix service offering usage as disk offering
 discard 63e2943  Fix UI conflicts
 discard 32f1af7  Add UI form for changeOfferingForVolume API
 discard 075487f  Added new API changeofferingforVolume API and corresponding 
changes
 discard 33975f1  Added disk offering change checks during resize volume 
operation
 discard 224db2b  Added configuration parameter to decide whether to check 
volume tags on the destination storagepool during migration
 discard af2f61a  Added volumeId parameter to listDiskOfferings API and the 
disksizestrictness flag of the current disk offering is honored while list disk 
offerings
 discard bf74c2f  UI: move compute only toggle button outside the box in add 
compute offering wizard
 discard 81bda1a  Fixed diskoffering automatic selection on add compute 
offering wizard
 discard 28c801f  UI: Separated compute and disk releated parameters in add 
compute offering wizard, also added association to disk offering
 discard d3b3d65  Move uselocalstorage column access from service offering to 
disk offering
 discard f146a01  Fix VM deployment from custom service offering
 discard 4851ac0  Fix delete compute offering
 discard 8a01c44  Added UI changes in deployvm wizard to accept override disk 
offering id
 discard 99a6dd6  Added diskoffering details to the service offering response
 discard 31af7f5  Added UI changes for Disk offering strictness in add compute 
offering form and Disk size strictness in add disk offering form
 discard d49f90e  Remove comments
 discard da33cd8  Added disk offering strictness to the service offering 
response
 discard e5ea262  Added disk size strictness in disk offering response
 discard 1c2e876  Fix User vm response to show proper service offering and disk 
offerings
 discard 2dbe47a  Added overrideDiskOfferingId parameter in deploy VM API which 
will override disk offering for the root disk both in template and ISO case
 discard ff81fd0  Add diskofferingstrictness to serviceoffering vo under quota
 discard 196175d  Added new API params to compute offering creation
 discard 0e514dd  Fix deployVM flow
 discard 27dbc49  diskoffering getsize() is only for strict disk offerings
 discard 27d191b  Decouple service offering and disk offering states
 discard 3e0f5c4  Remove diskofferingid from vminstance VO
 discard 345ea59  Decoupled service offering and disk offering
 discard fa8e630  Few more changes
 discard fa9d813  Schema changes and disk offering column change from "type" to 
"compute_only"
     add fc49f5d  simplify code using object shorthand in project view (#5820)
     add 11e59b3  Revert "README: again that time of the year! :christmas_tree: 
(#5792)"
     add 5f93bc8  assume a property is one when it isn't a number (#5647)
     add bf3d133  Merge remote-tracking branch 'origin/4.16'
     add 610b2d0  simplify code using optional chaining in compute views (#5635)
     add 4392cc4  ui: refactoring $notification according to the old version 
(#5819)
     add e06a66b  ldap: truststore per domain (#5816)
     add 2bd1dc1  Enable resetting config values to default value (#4230)
     add f071873  UI: Fix new UI missing 4 parameters when adding a BareMetal 
host (#5812)
     add 30ae9ee  Merge branch '4.16' into main
     add 51f69f7  server: do not return inaccessible entity details to normal 
users (#5827)
     add 2774bc1  use physical size instead of virtual size for migration. 
(#5750)
     add 3cbde8c  UI - Hide shrink disk option on XCP-NG/Xenserver (#5829)
     add 5c02f6d  Merge branch '4.16' into main
     add e993a20  [Veeam] Force ACS to use the template repository to clone job 
(#5774)
     add 5d7ea30  vmware: Remove restriction, in VMWare, to resize only SCSI 
disks (#5650)
     add 6d35b52  server: fix vm can be recovered by other accounts (#5822)
     add 84b9b61  api: fix typo in Volume Destroy state - volume can be 
recovered (#5833)
     add feb4343  ui: fix create network/vpc offering form (#5840)
     add 48006de  kvm: Set RAW format to RBD DATADISK (#5801)
     add 946f915  vmware: Persist empty values instead of null (#5748)
     add 0f926b5  UI: Add s3 provider option to create secondary storage (#5726)
     add 4916f3c  UI - Fix Locked "Override Root Disk Size" switch (#5843)
     add 028d338  remove VmWorkJob after adding a nic to a vm (#5658)
     add fadd74a  network: fix vm can be deployed on L2 network of other 
accounts (#5784)
     add 7ea2cbd  Storage pool absent (#5841)
     add 9293f5b  server: fix enable/disable static nat if userdata is not 
supported (#5839)
     add e1b56be  Merge branch '4.16' into main
     add c08592c  ui: update vm haenable only for supported vms (#5847)
     add 2e2d328  Add toggle button on the UI for list including elements in 
projects. (#5790)
     add 223bc11  ui: fix paging in enable static NAT form (#5849)
     add 216bea1  ipv6: disable IPv6-only shared network with VR (#5810)
     add c17ae74  ui: fix getDiagnosticsData files field (#5853)
     add d78a815  server: fix update vm with unconstrained offering (#5828)
     add 42a941c  Merge branch '4.16' into main
     add 001f421  UI - Deploy VM with params from the template, iso, network 
pages (#5653)
     add 4746509  [UI] Cancel all requests api, async jobs in UI when user logs 
out (#5663)
     add c86b98e  ui: show account configure limits tab for domain-admin (#5858)
     add a6271b8  Merge branch '4.16' into main
     add 619c754  Clear cache APIs when the switch domain with SAML user (#5855)
     add 59a615c  ui: fix deploy vm in basic zone (#5856)
     add a42ed1f  add a setting to config.json that allows users to set theme 
(#5584)
     add f5b0d2f  ui: fix create user domain, account selection (#5487)
     add e18ff60  Prevent upgrade failures if there are existing annotations 
permissions (#5846)
     add 0efdc53  Merge branch '4.16' into main
     add 7f000f5  Now correct values are shown when configuring limits for a 
domain. (#5874)
     add 0e2c09b  UI - Fixes Pod, Cluster selected is incorrect on addHost 
dialog (#5869)
     add fb35f46  Delete ldap config from UI (#5871)
     add f3289fb  server: fix regular user can create isolated network without 
sourcenat (#5844)
     add 4996b80  Now correct values are shown when configuring limits for a 
domain. (#5874) (#5880)
     add f639f56  fill volume attached field (#5865)
     add 97d6cd5  Merge branch '4.16' into main
     add e85326c  Schema changes and disk offering column change from "type" to 
"compute_only"
     add 6c2f8d8  Few more changes
     add 1ffb7a5  Decoupled service offering and disk offering
     add 5827b62  Remove diskofferingid from vminstance VO
     add 5808200  Decouple service offering and disk offering states
     add b0645a5  diskoffering getsize() is only for strict disk offerings
     add 90c83ea  Fix deployVM flow
     add 6854c67  Added new API params to compute offering creation
     add a044a6f  Add diskofferingstrictness to serviceoffering vo under quota
     add 2f453a9  Added overrideDiskOfferingId parameter in deploy VM API which 
will override disk offering for the root disk both in template and ISO case
     add a54ec08  Fix User vm response to show proper service offering and disk 
offerings
     add 011aabb  Added disk size strictness in disk offering response
     add 325ebb0  Added disk offering strictness to the service offering 
response
     add 7c035ef  Remove comments
     add 53e653f  Added UI changes for Disk offering strictness in add compute 
offering form and Disk size strictness in add disk offering form
     add be9680b  Added diskoffering details to the service offering response
     add aa567ae  Added UI changes in deployvm wizard to accept override disk 
offering id
     add c01f4e0  Fix delete compute offering
     add 51d0493  Fix VM deployment from custom service offering
     add f86bd07  Move uselocalstorage column access from service offering to 
disk offering
     add 3a5a92a  UI: Separated compute and disk releated parameters in add 
compute offering wizard, also added association to disk offering
     add 1412ff9  Fixed diskoffering automatic selection on add compute 
offering wizard
     add 0944ef6  UI: move compute only toggle button outside the box in add 
compute offering wizard
     add 9d5d89b  Added volumeId parameter to listDiskOfferings API and the 
disksizestrictness flag of the current disk offering is honored while list disk 
offerings
     add 28f5dd2  Added configuration parameter to decide whether to check 
volume tags on the destination storagepool during migration
     add 67e242d  Added disk offering change checks during resize volume 
operation
     add 859e3b0  Added new API changeofferingforVolume API and corresponding 
changes
     add c45f9d9  Add UI form for changeOfferingForVolume API
     add eaaa37e  Fix UI conflicts
     add 3d7a24a  Fix service offering usage as disk offering
     add 008b9f9  Fix unit test failures
     add 88050f1  fix user_vm_view
     add bdbbd75f Addressed review comments
     add d3a1216  Fixed service_offering_view
     add bd85724  Fix service offering edit flow
     add 2c39302  Fix service offering constructor to address custom offering
     add e616aaf  Fix domain_router_view to get proper service offering id
     add c16324a  Removed unused import
     add 6de0528  Addressed review comments and fixed update service offering 
flow with storage tags
     add f5080eed Added marvin test cases for checking disk offering strictness
     add 03947f1  review comments addressed
     add a81455f  Remove system_use column from disk offering join
     add e375775  update volume_view to update system_use column from service 
offering and not disk offering
     add 62fdc9d  Fix changeOfferingForVolume API for custom disk offering
     add bddec5e  Fix global setting implementation
     add 718de60  Fix list volumes, after changing system_use column from disk 
offering to service offering in volume_view
     add b708739  Changes for override root disk offering in deployvm wizard in 
case of custom offering
     add 59d0421  Fix a unit test case
     add 4f5b72e  Fixed recent unit test cases with new serviceofferingvo 
constructor
     add 25c2c41  Fix unit test in VolumeApiServiceImpl
     add ece268e  Added storage id for the list disk offering API and 
corresponding UI changes in migrateVolume and changeOfferingForVolume flow
     add 4a435d6  Rename global configuration parameter from 
storage.pool.tags.disk.offering.strictness to 
match.storage.pool.tags.with.disk.offering
     add 63a3766  Fix smoke test failures
     add 1c5560c  Added tool tip for migrate volume UI form
     add 4670b47  Address review comments and fix UI form of deploy VM in case 
of ISO.
     add 42844a8  Fixed resize volume UI form for data disk
     add 8c624f9  UI changes to disable override root disk size when override 
root disk offering is enabled
     add 5bf80cf  UI fix in deploy vm wizard
     add ba48b94  Fix listdiskoffering after rebasing with main
     add 1b9810e  Fixed UI in migrate and changeofferingfor volume to handle 
empty disk offering list Removed the volume's current disk offering from 
listDiskOffering response list
     add f7ba4c7  Added custom Iops to resize volume form and removed the 
current disk offering during change offering for volume UI form
     add d965060  Fix false response on updateDiskOffering API
     add 243522a  Added search field for changeofferingforvolume UI form
     add 4c29898  Fix resize volume and migrate volume to update volume path if 
DRS is applied on volume in datastore cluster
     add 60d67c4  Removed DB changes from 4.16 upgrade file
     add 89cda49  Resolving merge conflicts with main 4.17
     add 71e2207  Added support for auto migration and auto resize of the root 
volume upon changing the service offering for VM.
     add 2fc0125  UI: Added automigrate checkbox in scale VM form
     add 8be72bb  Addes since attributes to new API params
     add b1d37e0  Added shrinkOK parameter to changeofferingforvolume API
     add 5a661a2  Added shrinkOk param to UI in changeOfferingforVolume form
     add bdc5c7f  Added shrinkOk flag to scaleVM and 
changeServiceForVirtualMachines and UI form
     add 71fa71e  Removed old foreign key constraint on IDs of service offering 
and disk offering
     add f1a650b  Allow resize and automigrate of root volume if required in 
all cases of service offering change
     add 2c6698a  Allow only resize to higher disk size from UI
     add ff83da8  Fixing vue syntax error
     add 58dadd2  Make UI changes to provide root disk size box when the linked 
disk offering is of custom
     add 37c2683  Converted from check box to toggle in scale VM, 
changeoffering, resize and migrate volume forms
     add 550b6ed  Fix resize volume operation to update the VM settings
     add c16321f  Fix migratevolume form to pick selected storage pool id in 
list diskofferings API

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   (1bccb83)
            \
             N -- N -- N   refs/heads/decoupleServiceOfferingDiskOffering 
(c16321f)

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:
 README.md                                          |   2 +-
 .../cloud/configuration/ConfigurationService.java  |  10 +
 api/src/main/java/com/cloud/storage/Volume.java    |   4 +-
 .../org/apache/cloudstack/api/ApiConstants.java    |   1 +
 .../config/{UpdateCfgCmd.java => ResetCfgCmd.java} |  96 ++--
 .../api/command/admin/vm/RecoverVMCmd.java         |   3 +
 .../com/cloud/storage/template/OVAProcessor.java   |  12 +-
 .../engine/subsystem/api/storage/DataObject.java   |   2 +
 .../api/storage/SecondaryStorageService.java       |   3 +-
 .../com/cloud/vm/VirtualMachineManagerImpl.java    |  88 +++-
 .../engine/orchestration/DataMigrationUtility.java |  60 ++-
 .../engine/orchestration/NetworkOrchestrator.java  |   2 +-
 .../engine/orchestration/StorageOrchestrator.java  |  69 ++-
 .../engine/orchestration/VolumeOrchestrator.java   |   2 +
 .../java/com/cloud/dc/ClusterDetailsDaoImpl.java   |  28 +-
 .../com/cloud/upgrade/RolePermissionChecker.java   |  61 +++
 .../com/cloud/upgrade/dao/Upgrade41520to41600.java |  27 ++
 .../resources/META-INF/db/schema-41520to41600.sql  |  11 -
 .../resources/META-INF/db/schema-41600to41610.sql  |   4 +-
 .../storage/image/SecondaryStorageServiceImpl.java |  13 +-
 .../storage/image/store/TemplateObject.java        |   9 +
 .../cloudstack/storage/volume/VolumeObject.java    |   9 +
 .../framework/jobs/dao/VmWorkJobDao.java           |   2 +
 .../framework/jobs/dao/VmWorkJobDaoImpl.java       |  14 +
 .../cloudstack/framework/jobs/impl/AsyncJobVO.java |   2 +-
 .../framework/jobs/impl/VmWorkJobVO.java           |  24 +
 .../cloudstack/backup/veeam/VeeamClient.java       |  34 +-
 .../cloudstack/backup/veeam/VeeamClientTest.java   |  57 +++
 .../LibvirtGetStorageStatsCommandWrapper.java      |   3 +
 .../kvm/storage/KVMStorageProcessor.java           |   2 +-
 .../hypervisor/vmware/resource/VmwareResource.java |  51 +-
 .../cloudstack/api/command/LDAPConfigCmd.java      |   2 +-
 .../apache/cloudstack/ldap/LdapConfiguration.java  |  14 +-
 .../apache/cloudstack/ldap/LdapContextFactory.java |  10 +-
 .../cloudstack/ldap/LdapContextFactorySpec.groovy  |   6 +-
 .../cloudstack/ldap/LdapConfigurationTest.java     |   4 +-
 .../src/main/java/com/cloud/acl/DomainChecker.java |   7 +-
 .../configuration/ConfigurationManagerImpl.java    | 204 +++++++-
 .../java/com/cloud/network/NetworkModelImpl.java   |   9 +-
 .../java/com/cloud/network/NetworkServiceImpl.java |  38 +-
 .../com/cloud/network/rules/RulesManagerImpl.java  |  17 +-
 .../com/cloud/server/ManagementServerImpl.java     |   2 +
 .../main/java/com/cloud/vm/UserVmManagerImpl.java  |  28 +-
 .../diagnostics/to/DiagnosticsDataObject.java      |   5 +
 .../cloud/vpc/MockConfigurationManagerImpl.java    |   7 +
 .../smoke/test_reset_configuration_settings.py     | 367 ++++++++++++++
 test/integration/smoke/test_storage_policy.py      |   2 +
 tools/marvin/marvin/lib/base.py                    |  20 +
 ui/public/config.json                              |   1 +
 ui/public/locales/en.json                          |   5 +
 ui/src/api/index.js                                |   8 +-
 ui/src/components/header/SamlDomainSwitcher.vue    |   2 +-
 ui/src/components/page/GlobalLayout.vue            |   5 +-
 ui/src/components/view/DetailSettings.vue          |   3 +-
 ui/src/components/view/ListView.vue                |  26 +-
 ui/src/components/view/ResourceLimitTab.vue        |   4 +-
 ui/src/components/view/SettingsTab.vue             |  31 +-
 ui/src/components/view/UploadResourceIcon.vue      |  12 +-
 ui/src/config/section/account.js                   |   2 +-
 ui/src/config/section/compute.js                   |   6 +-
 ui/src/config/section/config.js                    |   8 +-
 ui/src/core/lazy_lib/components_use.js             |   1 -
 ui/src/store/getters.js                            |   1 +
 ui/src/store/modules/app.js                        |   7 +
 ui/src/store/modules/user.js                       |   4 +-
 ui/src/utils/plugins.js                            |  87 ++--
 ui/src/utils/request.js                            |  21 +-
 ui/src/views/AutogenView.vue                       |  39 +-
 ui/src/views/compute/AssignInstance.vue            |   3 +-
 ui/src/views/compute/ChangeAffinity.vue            |   3 +-
 ui/src/views/compute/CreateSSHKeyPair.vue          |   5 +-
 ui/src/views/compute/CreateSnapshotWizard.vue      |   3 +-
 ui/src/views/compute/DeployVM.vue                  | 192 ++++++--
 ui/src/views/compute/EditVM.vue                    |   2 +-
 ui/src/views/compute/KubernetesServiceTab.vue      |   5 +-
 ui/src/views/compute/MigrateWizard.vue             |   5 +-
 ui/src/views/compute/ScaleVM.vue                   |   3 +-
 ui/src/views/compute/StartVirtualMachine.vue       |   9 +-
 ui/src/views/compute/backup/BackupSchedule.vue     |   3 +-
 ui/src/views/compute/backup/FormSchedule.vue       |   3 +-
 .../views/compute/wizard/TemplateIsoSelection.vue  |   4 -
 ui/src/views/iam/AddAccount.vue                    |  15 +-
 ui/src/views/iam/AddLdapAccount.vue                |   6 +-
 ui/src/views/iam/AddUser.vue                       |  43 +-
 ui/src/views/iam/ChangeUserPassword.vue            |   3 +-
 ui/src/views/iam/ConfigureSamlSsoAuth.vue          |   7 +-
 ui/src/views/iam/CreateRole.vue                    |   3 +-
 ui/src/views/iam/DomainActionForm.vue              |   6 +-
 ui/src/views/iam/DomainView.vue                    |   3 +-
 ui/src/views/iam/EditUser.vue                      |   6 +-
 ui/src/views/iam/ImportRole.vue                    |   6 +-
 ui/src/views/image/IsoZones.vue                    |   3 +-
 ui/src/views/image/RegisterOrUploadIso.vue         |  15 +-
 ui/src/views/image/RegisterOrUploadTemplate.vue    |  12 +-
 ui/src/views/image/TemplateZones.vue               |   3 +-
 .../views/image/UpdateTemplateIsoPermissions.vue   |   3 +-
 ui/src/views/infra/AddPrimaryStorage.vue           |   3 +-
 ui/src/views/infra/AddSecondaryStorage.vue         | 181 ++++++-
 ui/src/views/infra/ClusterAdd.vue                  |   9 +-
 ui/src/views/infra/HostAdd.vue                     | 534 ++++++++++++---------
 ui/src/views/infra/InfraSummary.vue                |   6 +-
 ui/src/views/infra/MigrateData.vue                 |   6 +-
 ui/src/views/infra/PodAdd.vue                      |   6 +-
 ui/src/views/infra/network/DedicatedVLANTab.vue    |   3 +-
 ui/src/views/infra/network/EditTrafficLabel.vue    |   3 +-
 ui/src/views/infra/network/IpRangesTabPublic.vue   |  15 +-
 ui/src/views/infra/network/ServiceProvidersTab.vue |   6 +-
 .../infra/network/providers/AddF5LoadBalancer.vue  |   3 +-
 .../network/providers/AddNetscalerLoadBalancer.vue |   3 +-
 .../infra/network/providers/AddNiciraNvpDevice.vue |   3 +-
 .../network/providers/AddPaloAltoFirewall.vue      |   3 +-
 .../infra/network/providers/AddSrxFirewall.vue     |   3 +-
 .../views/infra/network/providers/ProviderItem.vue |   3 +-
 .../infra/network/providers/ProviderListView.vue   |   6 +-
 ui/src/views/infra/zone/StaticInputsForm.vue       |  24 +-
 ui/src/views/infra/zone/ZoneWizardAddResources.vue |  33 +-
 ui/src/views/infra/zone/ZoneWizardLaunchZone.vue   |   9 +-
 ui/src/views/network/AclListRulesTab.vue           |   3 +-
 ui/src/views/network/CreateIsolatedNetworkForm.vue |   3 +-
 ui/src/views/network/CreateL2NetworkForm.vue       |   3 +-
 ui/src/views/network/CreateSharedNetworkForm.vue   |   6 +-
 ui/src/views/network/CreateVlanIpRange.vue         |   6 +-
 ui/src/views/network/EnableStaticNat.vue           |   6 +-
 ui/src/views/network/InternalLBAssignVmForm.vue    |   3 +-
 ui/src/views/network/IpAddressesTab.vue            |   6 +-
 ui/src/views/network/VpcTiersTab.vue               |   3 +-
 ui/src/views/network/VpnDetails.vue                |   3 +-
 ui/src/views/offering/AddNetworkOffering.vue       |  29 +-
 ui/src/views/offering/AddVpcOffering.vue           |  28 +-
 ui/src/views/offering/UpdateOfferingAccess.vue     |   3 +-
 .../views/plugins/quota/EditTariffValueWizard.vue  |   3 +-
 ui/src/views/project/AccountsTab.vue               |   2 +-
 ui/src/views/project/InvitationTokenTemplate.vue   |   6 +-
 ui/src/views/project/InvitationsTemplate.vue       |  10 +-
 ui/src/views/project/iam/ProjectRoleTab.vue        |   9 +-
 ui/src/views/storage/FormSchedule.vue              |   3 +-
 ui/src/views/storage/ResizeVolume.vue              |   5 +-
 ui/src/views/storage/ScheduledSnapshots.vue        |   3 +-
 ui/src/views/storage/UploadLocalVolume.vue         |   9 +-
 ui/src/views/tools/ImportUnmanagedInstance.vue     |  21 +-
 ui/tests/unit/views/AutogenView.spec.js            |  37 +-
 ui/tests/unit/views/compute/MigrateWizard.spec.js  |  20 +-
 142 files changed, 2285 insertions(+), 901 deletions(-)
 copy 
api/src/main/java/org/apache/cloudstack/api/command/admin/config/{UpdateCfgCmd.java
 => ResetCfgCmd.java} (65%)
 create mode 100644 
engine/schema/src/main/java/com/cloud/upgrade/RolePermissionChecker.java
 create mode 100644 test/integration/smoke/test_reset_configuration_settings.py

Reply via email to