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

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


 discard b2273c2  Fixed some log messages
 discard 27ee42c  Added synchronisation during preparing and cancelling 
maintenance storage pools
 discard 41a5e6d  Addressed review comments
 discard aed3d21  VMware Datastore Cluster synchronisation Datastore cluster as 
a primary storage support is already there. But if any changes at vCenter to 
datastore cluster like addition/removal of datastore is not synchronised with 
CloudStack directly. It needs removal of primary storage from CloudStack and 
add it again to CloudStack.
     add 0094cf4  tests: Extend wait time after interrupt (#4815) (#4866)
     add 918c3bd  Merge release branch 4.14 to 4.15
     add 9717669  server: Fix issue with volume resize on VMWare (deploy as-is 
templates) (#4829)
     add 6428780  ui: Auto-focus input, form (#4762)
     add 3e8dbc05 ui: add cancel button missing on dialog (#4763)
     add caa55a5  ui: fix page size on mobile view (#4765)
     add b8884ef  server: create DB entry for storage pool capacity when create 
storage pool (#4805)
     add 8911111  server: Remove the rule(s) validation with api names while 
importing role, to be in sync with the create role permission behavior (#4840)
     add d6a7427  plugins: Add 'break' at RedifshClient request re-try loop 
(fixed issue from 4846) (#4864)
     add 03ad702  server: Set free memory to zero if greater than total memory 
(#4571)
     add 5b986be  ui: fix the style of zone wizard on mobile view (#4764)
     add 91aae1a  VMware Datastore Cluster synchronisation Datastore cluster as 
a primary storage support is already there. But if any changes at vCenter to 
datastore cluster like addition/removal of datastore is not synchronised with 
CloudStack directly. It needs removal of primary storage from CloudStack and 
add it again to CloudStack.
     add 9551af5  Addressed review comments
     add d4f99b5  Added synchronisation during preparing and cancelling 
maintenance storage pools
     add 8ee6d16  Fixed some log messages
     add 2ef604f  Log messages and API name fixing

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   (b2273c2)
            \
             N -- N -- N   refs/heads/DatastoreClusterSynchronisation (2ef604f)

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:
 .../apache/cloudstack/api/ApiServerService.java    |   2 -
 .../api/command/admin/acl/ImportRoleCmd.java       |   3 -
 .../cloudstack/api/response/UserVmResponse.java    |   2 +-
 .../volume/datastore/PrimaryDataStoreHelper.java   |   2 +
 .../hypervisor/vmware/resource/VmwareResource.java |   8 +-
 ...ernetesClusterResourceModifierActionWorker.java |  34 +++++
 .../KubernetesClusterStartWorker.java              |   2 +
 server/src/main/java/com/cloud/api/ApiServer.java  |  11 --
 .../com/cloud/api/query/dao/UserVmJoinDaoImpl.java |   7 +-
 .../java/com/cloud/storage/StorageManagerImpl.java |   3 +-
 .../com/cloud/storage/VolumeApiServiceImpl.java    |   9 +-
 .../main/java/com/cloud/vm/UserVmManagerImpl.java  |  22 +++-
 tools/apidoc/gen_toc.py                            |   2 +-
 ui/public/locales/en.json                          |   1 +
 ui/src/components/view/ListResourceTable.vue       |   3 +-
 ui/src/components/view/ResourceLimitTab.vue        |   1 +
 ui/src/style/vars.less                             |   8 +-
 ui/src/views/AutogenView.vue                       |  26 +++-
 ui/src/views/compute/AssignInstance.vue            |  20 ++-
 ui/src/views/compute/AttachIso.vue                 |   3 +-
 ui/src/views/compute/ChangeAffinity.vue            |   3 +-
 ui/src/views/compute/CreateKubernetesCluster.vue   |   3 +-
 ui/src/views/compute/CreateSSHKeyPair.vue          |   3 +-
 ui/src/views/compute/CreateSnapshotWizard.vue      |   3 +-
 ui/src/views/compute/DeployVM.vue                  |  13 +-
 ui/src/views/compute/DestroyVM.vue                 |   3 +-
 ui/src/views/compute/EditVM.vue                    |   3 +-
 ui/src/views/compute/InstanceTab.vue               |  10 +-
 ui/src/views/compute/MigrateWizard.vue             |   3 +-
 ui/src/views/compute/ScaleKubernetesCluster.vue    |   3 +-
 ui/src/views/compute/StartVirtualMachine.vue       |   3 +-
 ui/src/views/compute/UpgradeKubernetesCluster.vue  |   3 +-
 ui/src/views/compute/backup/FormSchedule.vue       |   3 +-
 .../compute/wizard/ComputeOfferingSelection.vue    |  13 +-
 ui/src/views/compute/wizard/ComputeSelection.vue   |   2 +
 ui/src/views/compute/wizard/DiskSizeSelection.vue  |   1 +
 ui/src/views/compute/wizard/MultiDiskSelection.vue |   1 +
 .../views/compute/wizard/NetworkConfiguration.vue  |   8 +-
 ui/src/views/iam/AddAccount.vue                    |   3 +-
 ui/src/views/iam/AddLdapAccount.vue                |   2 +-
 ui/src/views/iam/AddUser.vue                       |   3 +-
 ui/src/views/iam/ChangeUserPassword.vue            |   3 +-
 ui/src/views/iam/ConfigureSamlSsoAuth.vue          |   1 +
 ui/src/views/iam/CreateRole.vue                    |   3 +-
 ui/src/views/iam/DomainActionForm.vue              |  17 ++-
 ui/src/views/iam/EditUser.vue                      |   3 +-
 ui/src/views/iam/ImportRole.vue                    |   3 +-
 ui/src/views/iam/PermissionEditable.vue            |   3 +-
 .../views/image/AddKubernetesSupportedVersion.vue  |   3 +-
 ui/src/views/image/IsoZones.vue                    |   3 +-
 ui/src/views/image/RegisterOrUploadIso.vue         |   5 +-
 ui/src/views/image/RegisterOrUploadTemplate.vue    |   5 +-
 ui/src/views/image/TemplateZones.vue               |   3 +-
 .../image/UpdateKubernetesSupportedVersion.vue     |   3 +-
 .../views/image/UpdateTemplateIsoPermissions.vue   |   6 +-
 ui/src/views/infra/AddPrimaryStorage.vue           |   5 +-
 ui/src/views/infra/AddSecondaryStorage.vue         |   2 +-
 ui/src/views/infra/ClusterAdd.vue                  |   2 +-
 ui/src/views/infra/HostAdd.vue                     |   2 +-
 ui/src/views/infra/MigrateData.vue                 |   1 +
 ui/src/views/infra/PodAdd.vue                      |   3 +-
 ui/src/views/infra/network/DedicatedVLANTab.vue    |   1 +
 ui/src/views/infra/network/EditTrafficLabel.vue    |   1 +
 .../views/infra/network/IpRangesTabManagement.vue  |   1 +
 ui/src/views/infra/network/IpRangesTabPublic.vue   |   3 +-
 ui/src/views/infra/network/IpRangesTabStorage.vue  |   1 +
 ui/src/views/infra/network/ServiceProvidersTab.vue |   4 +
 .../infra/network/providers/AddF5LoadBalancer.vue  |   1 +
 .../network/providers/AddNetscalerLoadBalancer.vue |   1 +
 .../infra/network/providers/AddNiciraNvpDevice.vue |   1 +
 .../network/providers/AddPaloAltoFirewall.vue      |   1 +
 .../infra/network/providers/AddSrxFirewall.vue     |   1 +
 ui/src/views/infra/routers/RouterHealthCheck.vue   |   3 +-
 .../views/infra/zone/AdvancedGuestTrafficForm.vue  |   4 +-
 ui/src/views/infra/zone/IpAddressRangeForm.vue     | 145 ++++++++++++---------
 ui/src/views/infra/zone/StaticInputsForm.vue       |   7 +-
 ui/src/views/infra/zone/ZoneWizard.vue             |  37 +++++-
 ui/src/views/infra/zone/ZoneWizardAddResources.vue |  39 +++++-
 .../infra/zone/ZoneWizardNetworkSetupStep.vue      |  36 ++++-
 .../zone/ZoneWizardPhysicalNetworkSetupStep.vue    |  12 +-
 .../views/infra/zone/ZoneWizardZoneDetailsStep.vue |   1 +
 ui/src/views/infra/zone/ZoneWizardZoneTypeStep.vue |   1 +
 ui/src/views/network/AclListRulesTab.vue           |   6 +-
 ui/src/views/network/CreateIsolatedNetworkForm.vue |   3 +-
 ui/src/views/network/CreateL2NetworkForm.vue       |   3 +-
 ui/src/views/network/CreateSharedNetworkForm.vue   |   3 +-
 ui/src/views/network/CreateVlanIpRange.vue         |   1 +
 ui/src/views/network/CreateVpc.vue                 |   3 +-
 ui/src/views/network/CreateVpnCustomerGateway.vue  |   3 +-
 ui/src/views/network/EgressRulesTab.vue            |   2 +-
 ui/src/views/network/EnableStaticNat.vue           |   6 +-
 ui/src/views/network/FirewallRules.vue             |   4 +-
 .../views/network/IngressEgressRuleConfigure.vue   |  10 +-
 ui/src/views/network/InternalLBAssignVmForm.vue    |   6 +-
 ui/src/views/network/IpAddressesTab.vue            |   2 +
 ui/src/views/network/LoadBalancing.vue             |  12 +-
 ui/src/views/network/PortForwarding.vue            |   5 +-
 ui/src/views/network/StaticRoutesTab.vue           |   6 +-
 ui/src/views/network/VpcTab.vue                    |   8 +-
 ui/src/views/network/VpcTiersTab.vue               |   4 +-
 ui/src/views/offering/AddComputeOffering.vue       |   1 +
 ui/src/views/offering/AddDiskOffering.vue          |   1 +
 ui/src/views/offering/AddNetworkOffering.vue       |   1 +
 ui/src/views/offering/AddVpcOffering.vue           |   1 +
 ui/src/views/offering/ImportBackupOffering.vue     |   1 +
 ui/src/views/offering/UpdateOfferingAccess.vue     |   2 +
 .../views/plugins/quota/EditTariffValueWizard.vue  |   1 +
 ui/src/views/project/AddAccountOrUserToProject.vue |   6 +-
 ui/src/views/project/InvitationTokenTemplate.vue   |   1 +
 ui/src/views/project/InvitationsTemplate.vue       |   3 +-
 ui/src/views/project/iam/ProjectRoleTab.vue        |   8 +-
 ui/src/views/storage/AttachVolume.vue              |   1 +
 .../views/storage/CreateSnapshotFromVMSnapshot.vue |   1 +
 ui/src/views/storage/CreateVolume.vue              |   3 +-
 ui/src/views/storage/FormSchedule.vue              |   3 +-
 ui/src/views/storage/MigrateVolume.vue             |   5 +-
 ui/src/views/storage/ResizeVolume.vue              |   4 +-
 ui/src/views/storage/RestoreAttachBackupVolume.vue |   3 +-
 ui/src/views/storage/TakeSnapshot.vue              |   3 +-
 ui/src/views/storage/UploadLocalVolume.vue         |   3 +-
 .../cloudstack/utils/redfish/RedfishClient.java    |   3 +-
 .../utils/redfish/RedfishClientTest.java           |  22 ++++
 122 files changed, 594 insertions(+), 205 deletions(-)

Reply via email to