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

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


    from 7facd49  Merge branch '4.16'
     add 6401c85  Fix spelling (#6064)

No new revisions were added by this update.

Summary of changes:
 agent/conf/agent.properties                          |  4 ++--
 agent/src/main/java/com/cloud/agent/AgentShell.java  |  2 +-
 .../cloudstack/api/command/user/vm/DeployVMCmd.java  |  2 +-
 .../network/security/dao/VmRulesetLogDaoImpl.java    |  2 +-
 .../cache/manager/StorageCacheManagerImpl.java       |  2 +-
 .../cluster/ClusterServiceServletContainer.java      |  2 +-
 .../main/java/com/cloud/utils/db/Merovingian2.java   |  2 +-
 .../test/java/com/cloud/utils/db/GlobalLockTest.java |  2 +-
 .../framework/messagebus/MessageBusBase.java         |  2 +-
 .../framework/messagebus/MessageDetector.java        |  2 +-
 .../main/java/com/cloud/utils/db/StaticStrategy.java |  2 +-
 .../networkservice/BareMetalResourceBase.java        |  2 +-
 .../hyperv/resource/HypervDirectConnectResource.java |  4 ++--
 .../wrapper/LibvirtBackupSnapshotCommandWrapper.java |  2 +-
 .../wrapper/LibvirtManageSnapshotCommandWrapper.java |  2 +-
 .../kvm/storage/IscsiStorageCleanupMonitor.java      |  4 ++--
 .../kvm/storage/KVMStoragePoolManager.java           |  2 +-
 .../hypervisor/kvm/storage/KVMStorageProcessor.java  |  2 +-
 .../kvm/storage/LibvirtStorageAdaptor.java           | 20 ++++++++++----------
 .../kvm/storage/ScaleIOStorageAdaptor.java           |  4 ++--
 .../hypervisor/vmware/resource/VmwareResource.java   |  6 +++---
 .../resource/XenServerStorageProcessor.java          |  2 +-
 .../wrapper/xenbase/CitrixCreateCommandWrapper.java  |  2 +-
 .../cloud/network/resource/NetscalerResource.java    |  2 +-
 .../storage/datastore/util/ElastistorUtil.java       |  2 +-
 scripts/vm/hypervisor/kvm/setup_agent.sh             |  8 ++++----
 server/src/main/java/com/cloud/api/ApiDBUtils.java   |  2 +-
 .../cloud/network/NetworkMigrationManagerImpl.java   |  4 ++--
 .../VpcVirtualNetworkApplianceManagerImpl.java       |  2 +-
 .../com/cloud/network/rules/RulesManagerImpl.java    |  2 +-
 .../java/com/cloud/network/vpc/VpcManagerImpl.java   |  8 ++++----
 .../cloud/storage/snapshot/SnapshotManagerImpl.java  |  2 +-
 .../main/java/com/cloud/vm/SystemVmLoadScanner.java  |  2 +-
 .../cloudstack/vm/UnmanagedVMsManagerImpl.java       |  2 +-
 .../rdpconsole/src/main/java/streamer/SyncLink.java  |  2 +-
 .../src/main/java/streamer/debug/FakeSource.java     |  2 +-
 .../cloud/consoleproxy/ConsoleProxyClientBase.java   |  4 ++--
 .../com/cloud/consoleproxy/ConsoleProxyGCThread.java |  2 +-
 .../maint/test_zone_level_local_storage_setting.py   |  2 +-
 test/integration/component/test_acl_listsnapshot.py  |  6 +++---
 test/integration/component/test_acl_listvm.py        |  6 +++---
 test/integration/component/test_acl_listvolume.py    |  6 +++---
 test/integration/component/test_blocker_bugs.py      |  2 +-
 test/integration/component/test_haproxy.py           |  2 +-
 test/integration/component/test_rootvolume_resize.py |  2 +-
 .../component/test_vpc_network_pfrules.py            |  4 ++--
 .../component/test_vpc_network_staticnatrule.py      |  2 +-
 test/integration/smoke/test_accounts.py              |  4 ++--
 .../testpaths/testpath_snapshot_hadrning.py          |  4 ++--
 .../testpaths/testpath_volumelifecycle.py            |  8 ++++----
 .../java/com/cloud/test/regression/ApiCommand.java   |  2 +-
 .../cloud/test/stress/StressTestDirectAttach.java    |  2 +-
 .../com/cloud/test/stress/TestClientWithAPI.java     |  2 +-
 .../main/java/com/cloud/test/utils/ConsoleProxy.java |  2 +-
 tools/ngui/static/js/lib/angular.js                  |  2 +-
 .../hypervisor/vmware/mo/HypervisorHostHelper.java   |  2 +-
 .../cloud/hypervisor/vmware/mo/VirtualMachineMO.java |  8 ++++----
 .../cloud/hypervisor/vmware/util/VmwareContext.java  |  2 +-
 58 files changed, 96 insertions(+), 96 deletions(-)

Reply via email to