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

sureshanaparti pushed a change to branch healthcheck-4.20
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


 discard 5637ac6a945 4.20 Health Check, please don't merge this!
     add 9688cbb0953 systemvm: build 4.20.2 template with 'depmod -a' (#11128)
     add c94f75c7ea7 PowerFlex/ScaleIO - Wait after SDC service 
start/restart/stop, and retry to fetch SDC id/guid (#11099)
     add 06c80cdbe91 Remove unfinished usage job entries of the host (#10848)
     add 0d65c8c4543 Merge branch '4.19' into 4.20
     add 30deec89e6b kvm: consider Debian same as Ubuntu (#10917)
     add 23de6c7db4d Fix update resource count failure for domains (#11138)
     add d5f6b7cd1d1 Fix to create instances with smaller templates (< 1 GB) on 
PowerFlex/ScaleIO storage (#11211)
     add d72a05aa5ad Add special Icon to Shared FileSystem Instances (#10857)
     add 0ebf72df0f1 Handle nas backup and restore on Shared mount point. 
(#11204)
     add 1b74c2dd3f9 Fix restore from NAS backup when datadisk is older than 
the root disk. (#11258)
     add 4111061d295 list only own zones for resource admin (#11087)
     add 948ecda785e UI: Fix missing labels (#11102)
     add 111d87b845a console: optimise buffer sizes for faster console 
performance (#11221)
     add eeb4d55e890 polish: Fix some inconsistencies in object names and 
messages (#10856)
     add a51a04efc2b [Vmware to KVM Migration] Preserve boot type and boot mode 
of instances to be migrated (#10975)
     add 0b4a3170641 4.20 Health Check, please don't merge this!

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   (5637ac6a945)
            \
             N -- N -- N   refs/heads/healthcheck-4.20 (0b4a3170641)

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:
 .../cloud/agent/properties/AgentProperties.java    |   2 +-
 .../main/java/com/cloud/user/AccountService.java   |   2 +
 .../api/command/admin/cluster/ListClustersCmd.java |   6 +-
 .../api/command/admin/pod/ListPodsByCmd.java       |   4 +-
 .../command/user/userdata/RegisterUserDataCmd.java |  18 +-
 .../api/command/user/zone/ListZonesCmd.java        |   7 -
 .../cloudstack/api/response/UserDataResponse.java  |  22 +-
 .../org/apache/cloudstack/query/QueryService.java  |  12 +-
 .../main/java/com/cloud/usage/dao/UsageJobDao.java |   2 +
 .../java/com/cloud/usage/dao/UsageJobDaoImpl.java  |  37 +-
 .../cloudstack/backup/NASBackupProvider.java       |  13 +-
 .../kvm/resource/LibvirtComputingResource.java     |  11 +-
 .../LibvirtCheckConvertInstanceCommandWrapper.java |   2 +-
 .../LibvirtConvertInstanceCommandWrapper.java      |   2 +-
 .../wrapper/LibvirtReadyCommandWrapper.java        |   6 +-
 .../LibvirtRestoreBackupCommandWrapper.java        |  60 +-
 .../kvm/storage/ScaleIOStorageAdaptor.java         |  54 +-
 .../kvm/storage/ScaleIOStorageAdaptorTest.java     |   6 +-
 .../contrail/management/MockAccountManager.java    |   6 +
 .../lifecycle/StorageVmSharedFSLifeCycle.java      |  25 +-
 .../lifecycle/StorageVmSharedFSLifeCycleTest.java  |  11 +-
 .../driver/ScaleIOPrimaryDataStoreDriver.java      |  16 +-
 .../datastore/manager/ScaleIOSDCManagerImpl.java   |  14 +-
 .../datastore/provider/ScaleIOHostListener.java    |   6 +-
 .../storage/datastore/util/ScaleIOUtil.java        |  41 +-
 .../driver/ScaleIOPrimaryDataStoreDriverTest.java  |  12 +
 .../kvm/storage/StorPoolStorageAdaptor.java        |   3 +
 pom.xml                                            |   2 +-
 .../java/com/cloud/api/query/QueryManagerImpl.java | 478 ++++++-------
 .../resourcelimit/ResourceLimitManagerImpl.java    | 110 ++-
 .../com/cloud/storage/VolumeApiServiceImpl.java    |  16 +-
 .../java/com/cloud/user/AccountManagerImpl.java    |   1 +
 .../cloudstack/backup/BackupManagerImpl.java       |   2 +
 .../cloudstack/vm/UnmanagedVMsManagerImpl.java     |   8 +
 .../cloud/storage/VolumeApiServiceImplTest.java    |   7 +-
 .../com/cloud/user/MockAccountManagerImpl.java     |   5 +
 .../java/com/cloud/consoleproxy/ConsoleProxy.java  |   7 +
 .../consoleproxy/ConsoleProxyNoVncClient.java      |  84 ++-
 .../com/cloud/consoleproxy/vnc/NoVncClient.java    |   8 +-
 .../cloud/consoleproxy/vnc/network/NioSocket.java  |   3 +-
 .../consoleproxy/vnc/network/NioSocketHandler.java |   3 +-
 .../vnc/network/NioSocketHandlerImpl.java          |  16 +-
 .../vnc/network/NioSocketInputStream.java          |  46 +-
 .../vnc/network/NioSocketSSLEngineManager.java     |  40 +-
 .../vnc/network/NioSocketTLSInputStream.java       |   3 +-
 .../vnc/network/NioSocketTLSOutputStream.java      |   5 +-
 systemvm/agent/conf/consoleproxy.properties        |   1 +
 .../appliance/systemvmtemplate/scripts/finalize.sh |   1 +
 ui/public/locales/ar.json                          |  24 +-
 ui/public/locales/ca.json                          |  22 +-
 ui/public/locales/de_DE.json                       |  26 +-
 ui/public/locales/el_GR.json                       |  51 +-
 ui/public/locales/en.json                          | 786 +++++++++++----------
 ui/public/locales/es.json                          |  24 +-
 ui/public/locales/fr_FR.json                       |  24 +-
 ui/public/locales/hi.json                          |   4 +-
 ui/public/locales/hu.json                          |  26 +-
 ui/public/locales/it_IT.json                       |  24 +-
 ui/public/locales/ja_JP.json                       |  24 +-
 ui/public/locales/ko_KR.json                       |  24 +-
 ui/public/locales/nb_NO.json                       |  24 +-
 ui/public/locales/nl_NL.json                       |  24 +-
 ui/public/locales/pl.json                          |  24 +-
 ui/public/locales/pt_BR.json                       |  24 +-
 ui/public/locales/ru_RU.json                       |  24 +-
 ui/public/locales/zh_CN.json                       |  24 +-
 ui/src/components/view/InfoCard.vue                |  21 +-
 ui/src/components/view/ListView.vue                |   7 +-
 ui/src/config/section/account.js                   |   2 +-
 ui/src/config/section/compute.js                   |   6 +-
 ui/src/config/section/network.js                   |  21 +-
 ui/src/views/compute/AutoScaleVmProfile.vue        |  14 +-
 ui/src/views/compute/CreateAutoScaleVmGroup.vue    |  14 +-
 ui/src/views/compute/DeployVM.vue                  |  14 +-
 ui/src/views/compute/DeployVnfAppliance.vue        |  14 +-
 ui/src/views/compute/EditVM.vue                    |   2 +-
 ui/src/views/compute/RegisterUserData.vue          |   8 +-
 ui/src/views/compute/ResetUserData.vue             |  14 +-
 ui/src/views/compute/wizard/UserDataSelection.vue  |   4 +-
 ui/src/views/image/RegisterOrUploadIso.vue         |   4 +-
 ui/src/views/image/RegisterOrUploadTemplate.vue    |   4 +-
 ui/src/views/image/UpdateISO.vue                   |   4 +-
 ui/src/views/image/UpdateTemplate.vue              |   4 +-
 ui/src/views/infra/network/ServiceProvidersTab.vue |   2 +-
 .../{AclListRulesTab.vue => AclRulesTab.vue}       |   2 +-
 ui/src/views/network/VpcTab.vue                    |   8 +-
 ui/src/views/offering/AddNetworkOffering.vue       |   2 +-
 .../java/com/cloud/usage/UsageManagerImpl.java     |  27 +-
 88 files changed, 1417 insertions(+), 1230 deletions(-)
 rename ui/src/views/network/{AclListRulesTab.vue => AclRulesTab.vue} (99%)

Reply via email to