This is an automated email from the ASF dual-hosted git repository.
dahn pushed a change to branch dummy
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
omit a89e2749580 do not merge
add 0d9292c9ea1 Remove powermock from database/quota plugin (#7795)
add e876ef096ef Fix links to `release notes` in README and CHANGES (#7797)
add 6f4503488be pre-commit: apply `end-of-file-fixer` to all files (#7551)
add fd13184dda9 UI unit test: fix expected values (#7792)
add 2bb079189c2 make NoopDbUpgrade do a systemvm template check (#7564)
add 60ab494c259 packaging: unalias cp before package upgrade (#7722)
add 87f218c68cd UI: decode userdata in EditVM dialog (#7796)
add da7fc72c660 Refactoring StorPool's smoke tests (#7392)
add c86684fbdd0 UI: allow new keys for VM details (#7793)
add 7ee697fcc5c Merge release branch 4.18 to main
add b4032d9984e include all VMs when projects selected not just for admins
(#7667)
add 57779a8586c Remove nic allocation txn during Vm deploy. During Vm
deploy failure, this will allow cleanup of any nics that are successfully
provisioned (#7809)
add 6b218257465 make details optional for addGuestOs API (#7812)
add e3bd2c0a8cf Merge branch '4.18'
add 90443cdd431 Remove powermock from xenserver hypervisor plugin (#7806)
add 84974a1e086 Remove powermock from vmware-base & vmware hypervisor
plugin (#7798)
add dc5e4f3ec6e Allow KVM overcommit to work without reducing minimum VM
memory when vm ballooning is disabled (#7810)
add eb31e3d7950 Merge release branch 4.18 to main
new b05a3dba632 do not 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 (a89e2749580)
\
N -- N -- N refs/heads/dummy (b05a3dba632)
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.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.pre-commit-config.yaml | 2 +-
CHANGES.md | 2 +-
LICENSE | 1 -
README.md | 2 +-
.../cloudstack/api-planner/module.properties | 2 +-
.../allocator/spring-core-allocator-context.xml | 2 +-
...ore-lifecycle-allocator-context-inheritable.xml | 2 +-
.../cloudstack/direct-download/module.properties | 2 +-
...ing-core-lifecycle-core-context-inheritable.xml | 2 +-
.../cloudstack/kubernetes/module.properties | 2 +-
.../META-INF/cloudstack/planner/module.properties | 2 +-
debian/cloudstack-cli.install | 2 +-
debian/cloudstack-common.postinst | 2 +-
debian/cloudstack-docs.install | 2 +-
.../engine/orchestration/NetworkOrchestrator.java | 290 ++++++++++-----------
.../com/cloud/upgrade/DatabaseUpgradeChecker.java | 17 +-
.../main/resources/META-INF/db/data-217to218.sql | 1 -
.../main/resources/META-INF/db/schema-20to21.sql | 1 -
.../META-INF/db/schema-21to22-cleanup.sql | 2 -
.../META-INF/db/schema-21to22-premium.sql | 3 -
.../main/resources/META-INF/db/schema-21to22.sql | 1 -
.../resources/META-INF/db/schema-2210to2211.sql | 1 -
.../resources/META-INF/db/schema-2211to2212.sql | 1 -
.../resources/META-INF/db/schema-2212to2213.sql | 1 -
.../resources/META-INF/db/schema-2213to2214.sql | 1 -
.../META-INF/db/schema-2214to30-cleanup.sql | 1 -
.../META-INF/db/schema-221to222-cleanup.sql | 1 -
.../main/resources/META-INF/db/schema-221to222.sql | 2 -
.../META-INF/db/schema-222to224-premium.sql | 1 -
.../main/resources/META-INF/db/schema-222to224.sql | 1 -
.../main/resources/META-INF/db/schema-224to225.sql | 1 -
.../main/resources/META-INF/db/schema-225to226.sql | 1 -
.../META-INF/db/schema-227to228-premium.sql | 1 -
.../main/resources/META-INF/db/schema-227to228.sql | 2 -
.../main/resources/META-INF/db/schema-228to229.sql | 2 -
.../META-INF/db/schema-22beta3to22beta4.sql | 2 -
.../META-INF/db/schema-304to305-cleanup.sql | 1 -
.../META-INF/db/schema-305to306-cleanup.sql | 2 +-
.../main/resources/META-INF/db/schema-306to307.sql | 2 +-
.../META-INF/db/schema-307to410-cleanup.sql | 6 -
.../META-INF/db/schema-40to410-cleanup.sql | 1 -
.../main/resources/META-INF/db/schema-40to410.sql | 1 -
.../META-INF/db/schema-41000to41100-cleanup.sql | 2 +-
.../META-INF/db/schema-410to420-cleanup.sql | 2 -
.../resources/META-INF/db/schema-41110to41120.sql | 2 +-
.../META-INF/db/schema-41500to41510-cleanup.sql | 1 -
.../resources/META-INF/db/schema-41500to41510.sql | 1 -
.../META-INF/db/schema-41510to41520-cleanup.sql | 1 -
.../META-INF/db/schema-41600to41610-cleanup.sql | 2 +-
.../META-INF/db/schema-41610to41700-cleanup.sql | 2 +-
.../resources/META-INF/db/schema-41610to41700.sql | 2 +-
.../META-INF/db/schema-41700to41710-cleanup.sql | 2 +-
.../resources/META-INF/db/schema-41700to41710.sql | 2 +-
.../META-INF/db/schema-421to430-cleanup.sql | 1 -
.../main/resources/META-INF/db/schema-441to442.sql | 1 -
.../META-INF/db/schema-442to450-cleanup.sql | 2 +-
.../META-INF/db/schema-452to460-cleanup.sql | 1 -
.../main/resources/META-INF/db/schema-452to460.sql | 2 -
.../main/resources/META-INF/db/schema-461to470.sql | 1 -
.../main/resources/META-INF/db/schema-480to481.sql | 1 -
.../META-INF/db/schema-481to490-cleanup.sql | 1 -
.../META-INF/db/schema-490to4910-cleanup.sql | 1 -
.../META-INF/db/schema-4910to4920-cleanup.sql | 1 -
...spring-engine-storage-snapshot-core-context.xml | 2 +-
.../cloudstack/storage-allocator/module.properties | 2 +-
.../spring-engine-storage-volume-core-context.xml | 2 +-
.../volume/src/test/resource/testContext.xml | 2 +-
.../core/spring-engine-userdata-core-context.xml | 2 +-
framework/db/src/test/resources/db.properties | 2 +-
framework/direct-download/pom.xml | 2 +-
.../core/spring-framework-ipc-core-context.xml | 2 +-
framework/jobs/src/test/resources/log4j.properties | 1 -
.../testfiles/all/test2-defaults.properties | 1 -
.../testfiles/missingname/module.properties | 1 -
.../testhierarchy/excluded/module.properties | 2 +-
.../testhierarchy/excluded2/module.properties | 2 +-
.../orphan-of-excluded/defaults.properties | 2 +-
.../orphan-of-excluded/module.properties | 2 +-
packaging/centos7/cloud-ipallocator.rc | 1 -
packaging/centos7/cloud.spec | 1 -
packaging/centos8/cloud-ipallocator.rc | 1 -
packaging/centos8/cloud.spec | 1 +
.../acl-project-role-based/module.properties | 2 +-
.../acl-static-role-based/module.properties | 2 +-
.../explicit-dedication/module.properties | 2 +-
.../cloudstack/host-affinity/module.properties | 2 +-
.../host-affinity/spring-host-affinity-context.xml | 2 +-
.../host-anti-affinity/module.properties | 2 +-
.../cloudstack/rate-limit/module.properties | 2 +-
.../solidfire-intg-test/module.properties | 2 +-
.../cloudstack/vmware-sioc/module.properties | 2 +-
.../cloudstack/networker/module.properties | 2 +-
.../networker/spring-backup-networker-context.xml | 1 -
.../api/response/QuotaResponseBuilderImplTest.java | 21 +-
.../org.mockito.plugins.MockMaker | 0
.../implicit-dedication/module.properties | 2 +-
.../user-concentrated-pod/module.properties | 2 +-
.../spring-skip-heurestics-context.xml | 1 -
.../host-allocator-random/module.properties | 2 +-
.../cloudstack/baremetal-compute/module.properties | 2 +-
.../baremetal-discoverer/module.properties | 2 +-
.../cloudstack/baremetal-network/module.properties | 2 +-
.../cloudstack/baremetal-planner/module.properties | 2 +-
.../cloudstack/baremetal-storage/module.properties | 2 +-
.../hyperv/DotNet/ServerResource/.gitignore | 1 -
.../ServerResource/AgentShell/AgentShell.csproj | 2 +-
.../DotNet/ServerResource/AgentShell/App.config | 2 +-
.../ServerResource/AgentShell/packages.config | 2 +-
.../HypervResource/HypervResource.csproj | 2 +-
.../ServerResource/HypervResource/heartbeat.bat | 2 +-
.../ServerResource/HypervResource/packages.config | 2 +-
.../ServerResource/ServerResource.Tests/App.config | 2 +-
.../ServerResource.Tests/packages.config | 2 +-
.../ServerResource/WmiWrappers/WmiWrappers.csproj | 2 +-
.../cloudstack/hyperv-compute/module.properties | 2 +-
.../cloudstack/hyperv-discoverer/module.properties | 2 +-
.../kvm/resource/LibvirtComputingResource.java | 18 +-
.../hypervisor/kvm/resource/LibvirtVMDef.java | 4 +-
.../cloudstack/kvm-compute/module.properties | 2 +-
.../kvm/resource/LibvirtComputingResourceTest.java | 4 +-
.../hypervisor/kvm/resource/LibvirtVMDefTest.java | 20 +-
.../cloudstack/ovm-compute/module.properties | 2 +-
.../cloudstack/ovm-discoverer/module.properties | 2 +-
.../main/scripts/vm/hypervisor/ovm/configureOvm.sh | 1 -
.../cloudstack/simulator-compute/module.properties | 2 +-
.../simulator-discoverer/module.properties | 2 +-
.../cloudstack/simulator-storage/module.properties | 2 +-
.../cloudstack/core/spring-vmware-core-context.xml | 2 +-
.../cloudstack/vmware-compute/module.properties | 2 +-
.../cloudstack/vmware-discoverer/module.properties | 2 +-
.../cloudstack/vmware-network/module.properties | 2 +-
.../spring-vmware-network-context.xml | 2 +-
.../cloudstack/vmware-storage/module.properties | 2 +-
.../com/cloud/hypervisor/guru/VMwareGuruTest.java | 17 +-
.../hypervisor/guru/VmwareVmImplementerTest.java | 17 +-
.../vmware/VmwareDatacenterApiUnitTest.java | 24 +-
.../vmware/manager/VmwareManagerImplTest.java | 6 +-
.../vmware/resource/VmwareResourceTest.java | 59 +++--
.../motion/VmwareStorageMotionStrategyTest.java | 4 +-
.../org.mockito.plugins.MockMaker | 0
.../cloudstack/xenserver-compute/module.properties | 2 +-
.../xenserver-discoverer/module.properties | 2 +-
.../xenserver/resource/CitrixResourceBaseTest.java | 60 +++--
.../resource/Xenserver625StorageProcessorTest.java | 157 ++++++-----
.../wrapper/xenbase/CitrixRequestWrapperTest.java | 68 +----
.../wrapper/xenbase/XcpServerWrapperTest.java | 6 +-
.../wrapper/xenbase/XenServer56FP1WrapperTest.java | 4 +-
.../wrapper/xenbase/XenServer56WrapperTest.java | 8 +-
.../wrapper/xenbase/XenServer610WrapperTest.java | 50 +---
.../xenbase/XenServer620SP1WrapperTest.java | 4 +-
.../wrapper/xenbase/XenServer620WrapperTest.java | 4 +-
.../org.mockito.plugins.MockMaker | 0
.../META-INF/cloudstack/vcs/module.properties | 2 +-
.../cloudstack/cisco-vnmc/module.properties | 2 +-
.../scripts/network/cisco/create-acl-policy.xml | 2 +-
.../main/scripts/network/cisco/create-ip-pool.xml | 2 +-
.../META-INF/cloudstack/elb/module.properties | 2 +-
.../META-INF/cloudstack/globodns/module.properties | 2 +-
.../META-INF/cloudstack/contrail/module.properties | 2 +-
.../src/test/resources/log4j.properties | 1 -
.../src/test/resources/mysql_db_stop.sh | 2 -
.../src/test/resources/providerContext.xml | 2 +-
.../src/test/resources/publicNetworkContext.xml | 2 +-
.../cloudstack/netscaler/module.properties | 2 +-
.../META-INF/cloudstack/nvp/module.properties | 2 +-
.../opendaylight/spring-opendaylight-context.xml | 1 -
.../META-INF/cloudstack/paloalto/module.properties | 2 +-
.../paloalto/spring-paloalto-context.xml | 2 +-
.../META-INF/cloudstack/ssp/module.properties | 2 +-
plugins/network-elements/tungsten/pom.xml | 2 +-
.../META-INF/cloudstack/tungsten/module.properties | 2 +-
.../tungsten/src/test/resources/log4j.properties | 1 -
.../META-INF/cloudstack/vxlan/module.properties | 2 +-
.../storage-image-default/module.properties | 2 +-
.../cloudstack/storage-image-s3/module.properties | 2 +-
.../storage-image-swift/module.properties | 2 +-
.../storage-volume-cloudbyte/module.properties | 2 +-
.../storage-volume-default/module.properties | 2 +-
.../module.properties | 2 +-
.../spring-storage-volume-nexenta-context.xml | 2 +-
.../storage-volume-solidfire/module.properties | 2 +-
plugins/storage/volume/storpool/pom.xml | 34 +++
.../META-INF/cloudstack/ldap/module.properties | 2 +-
.../org/apache/cloudstack/ldap/LdapUserSpec.groovy | 2 +-
.../NoLdapUserMatchingQueryExceptionSpec.groovy | 2 +-
.../ldap/src/test/resources/cloudstack.org.ldif | 1 -
.../ldap/src/test/resources/ldapunit.ldif | 2 +-
.../ldap/src/test/resources/minimal.ldif | 1 -
.../ldap/src/test/resources/unboundid.ldif | 1 -
.../META-INF/cloudstack/md5/module.properties | 2 +-
.../cloudstack/plaintext/module.properties | 2 +-
.../cloudstack/sha256salted/module.properties | 2 +-
.../static-pin/pom.xml | 2 +-
.../cloudstack/staticpin/module.properties | 2 +-
.../user-two-factor-authenticators/totp/pom.xml | 2 +-
.../META-INF/cloudstack/totp/module.properties | 2 +-
.../SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in | 1 -
.../SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in | 1 -
.../SYSCONFDIR/init.d/cloud-ipallocator.in | 1 -
.../SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in | 1 -
.../sles/SYSCONFDIR/init.d/cloud-ipallocator.in | 1 -
.../ubuntu/SYSCONFDIR/init.d/cloud-ipallocator.in | 1 -
scripts/installer/export-templates.sh | 1 -
scripts/network/juniper/dest-nat-rule-getone.xml | 2 -
.../juniper/firewall-filter-bytes-getall.xml | 1 -
scripts/network/juniper/src-nat-rule-add.xml | 2 -
scripts/network/juniper/src-nat-rule-getall.xml | 1 -
scripts/network/juniper/src-nat-rule-getone.xml | 2 -
scripts/network/juniper/static-nat-rule-add.xml | 2 -
scripts/network/juniper/static-nat-rule-getall.xml | 2 -
scripts/network/juniper/static-nat-rule-getone.xml | 2 -
scripts/network/juniper/test.xml | 1 -
scripts/network/juniper/zone-interface-add.xml | 1 -
scripts/network/juniper/zone-interface-getone.xml | 1 -
scripts/storage/qcow2/managevolume.sh | 2 -
scripts/storage/secondary/setup-sysvm-tmplt | 2 +-
scripts/vm/hypervisor/kvm/nsrkvmbackup.sh | 2 +-
scripts/vm/hypervisor/kvm/nsrkvmrestore.sh | 2 +-
.../xenserver/add_to_vcpus_params_live.sh | 1 -
.../vm/hypervisor/xenserver/cloud-plugin-storage | 1 -
.../hypervisor/xenserver/cloud-prepare-upgrade.sh | 1 -
.../vm/hypervisor/xenserver/cloud-setup-bonding.sh | 1 -
scripts/vm/hypervisor/xenserver/cloudlog | 1 -
scripts/vm/hypervisor/xenserver/make_migratable.sh | 2 -
scripts/vm/hypervisor/xenserver/network_info.sh | 1 -
scripts/vm/hypervisor/xenserver/ovstunnel | 2 +-
scripts/vm/hypervisor/xenserver/setup_iscsi.sh | 1 -
scripts/vm/hypervisor/xenserver/setupxenserver.sh | 1 -
.../vm/hypervisor/xenserver/upgrade_vnc_config.sh | 1 -
scripts/vm/hypervisor/xenserver/vmopsSnapshot | 1 -
scripts/vm/hypervisor/xenserver/xcposs/patch | 2 +-
scripts/vm/hypervisor/xenserver/xcpserver/patch | 2 +-
scripts/vm/hypervisor/xenserver/xenheartbeat.sh | 2 +-
scripts/vm/hypervisor/xenserver/xenserver60/patch | 2 +-
scripts/vm/hypervisor/xenserver/xenserver62/patch | 2 +-
scripts/vm/hypervisor/xenserver/xenserver65/patch | 2 +-
scripts/vm/hypervisor/xenserver/xs_cleanup.sh | 1 -
scripts/vm/network/ovs-pvlan-cleanup.sh | 1 -
scripts/vm/network/ovs-pvlan-vm.sh | 1 -
.../vm/network/tungsten/setup_tungsten_vrouter.sh | 2 +-
server/conf/cloudstack-catalina.logrotate | 2 +-
.../java/com/cloud/api/query/QueryManagerImpl.java | 6 +-
.../java/com/cloud/user/AccountManagerImpl.java | 13 +-
.../core/spring-server-core-misc-context.xml | 2 +-
.../server-alert-adapter-backend/module.properties | 2 +-
.../server-alert-adapter-compute/module.properties | 2 +-
.../server-alert-adapter-storage/module.properties | 2 +-
.../cloudstack/server-allocator/module.properties | 2 +-
.../cloudstack/server-api/module.properties | 2 +-
.../server-api/spring-server-api-context.xml | 2 +-
.../cloudstack/server-compute/module.properties | 2 +-
.../cloudstack/server-discoverer/module.properties | 2 +-
.../cloudstack/server-fencer/module.properties | 2 +-
.../server-investigator/module.properties | 2 +-
.../cloudstack/server-network/module.properties | 2 +-
.../cloudstack/server-planner/module.properties | 2 +-
.../cloudstack/server-storage/module.properties | 2 +-
.../server-template-adapter/module.properties | 2 +-
.../system/spring-server-system-context.xml | 2 +-
services/console-proxy/rdpconsole/rdp-config.bat | 1 -
.../rdpconsole/src/test/doc/dev-rdp-config.bat | 1 -
.../secondary-storage-discoverer/module.properties | 2 +-
setup/bindir/cloud-sysvmadm.in | 2 -
setup/db/221to222upgrade.sh | 2 -
setup/db/create-schema.sql | 1 -
setup/db/index-20to21.sql | 1 -
setup/db/index-212to213.sql | 1 -
setup/db/templates.sql | 1 -
systemvm/agent/certs/realhostip.key | 2 +-
systemvm/agent/js/jquery.js | 2 +-
systemvm/agent/noVNC/app/locale/cs.json | 2 +-
systemvm/agent/noVNC/app/locale/de.json | 2 +-
systemvm/agent/noVNC/app/locale/el.json | 2 +-
systemvm/agent/noVNC/app/locale/es.json | 2 +-
systemvm/agent/noVNC/app/locale/fr.json | 2 +-
systemvm/agent/noVNC/app/locale/it.json | 2 +-
systemvm/agent/noVNC/app/locale/ja.json | 2 +-
systemvm/agent/noVNC/app/locale/ko.json | 2 +-
systemvm/agent/noVNC/app/locale/nl.json | 2 +-
systemvm/agent/noVNC/app/locale/pl.json | 2 +-
systemvm/agent/noVNC/app/locale/pt_BR.json | 2 +-
systemvm/agent/noVNC/app/locale/ru.json | 2 +-
systemvm/agent/noVNC/app/locale/sv.json | 2 +-
systemvm/agent/noVNC/app/locale/tr.json | 2 +-
systemvm/agent/noVNC/app/locale/zh_CN.json | 2 +-
systemvm/agent/noVNC/app/locale/zh_TW.json | 2 +-
systemvm/agent/noVNC/core/input/uskeysym.js | 2 +-
systemvm/agent/noVNC/core/ra2.js | 2 +-
systemvm/agent/noVNC/core/util/md5.js | 2 +-
systemvm/debian/etc/modprobe.d/pcspkr.conf | 2 +-
.../system/hyperv-daemons.hv-fcopy-daemon.service | 2 +-
.../system/hyperv-daemons.hv-kvp-daemon.service | 2 +-
systemvm/debian/opt/cloud/bin/getRouterAlerts.sh | 2 +-
systemvm/debian/opt/cloud/bin/patched.sh | 2 +-
systemvm/debian/opt/cloud/bin/setup/cksnode.sh | 2 +-
.../opt/cloud/bin/update_interface_config.sh | 2 +-
systemvm/debian/opt/cloud/testdata/vmp0001.json | 2 +-
.../plugins/storpool/MigrateVolumeToStorPool.py | 19 +-
.../plugins/storpool/TestStorPoolVolumes.py | 23 +-
.../plugins/storpool/TestTagsOnStorPool.py | 18 +-
.../plugins/storpool/TestVmSnapshots.py | 16 +-
test/integration/plugins/storpool/sp_util.py | 6 +
test/metadata/func/templates_sync.xml | 3 -
test/scripts/bootstrap-regression.sh | 2 +-
test/scripts/build-env.sh | 2 -
test/scripts/checkOutOfMemory.sh | 2 +-
test/scripts/cleanparallel.sh | 3 -
test/scripts/deploy-and-run-regression.sh | 1 -
test/scripts/deploycluster.sh | 5 -
test/scripts/executeUserAPI.sh | 2 -
test/scripts/run.sh | 1 -
test/scripts/usage/allocated.sh | 1 -
test/scripts/usage/volume_usage.sh | 2 -
test/scripts/xen/corrupttemplate.sh | 2 +-
test/scripts/xen/createfaketemplate.sh | 2 +-
test/scripts/xen/killvm.sh | 2 +-
test/scripts/xen/listtemplate.sh | 2 +-
test/scripts/xen/listvdi.sh | 2 +-
test/scripts/xen/listvm.sh | 2 +-
test/scripts/xen/ms.sh | 2 +-
test/scripts/xen/removetemplate.sh | 2 +-
test/scripts/xen/shutdown.sh | 2 +-
test/scripts/xen/sleep.sh | 2 +-
tools/apidoc/generatecommand.xsl | 1 -
tools/apidoc/generatecustomcommand.xsl | 1 -
tools/apidoc/generategenericcommand.xsl | 1 -
tools/apidoc/generatetoc.xsl | 1 -
tools/devcloud4/.gitignore | 2 +-
.../binary-installation-advanced/Berksfile | 2 +-
.../binary-installation-advanced/marvin.cfg.erb | 2 +-
.../devcloud4/binary-installation-basic/Berksfile | 2 +-
.../binary-installation-basic/marvin.cfg.erb | 2 +-
.../binary-installation/attributes/default.rb | 2 +-
.../binary-installation/recipes/database_server.rb | 1 -
.../common/binary-installation/recipes/default.rb | 2 +-
.../development-installation/attributes/default.rb | 2 +-
.../recipes/database_server.rb | 1 -
.../development-installation/recipes/default.rb | 2 +-
.../recipes/system_templates.rb | 2 +-
tools/devcloud4/prefill.sql | 2 +-
tools/docker/Dockerfile.smokedev | 2 +-
tools/eclipse/set-eclipse-profile.sh | 2 +-
tools/git/prepare-commit-msg | 1 -
tools/marvin/marvin/misc/build/vm-start.sh | 1 -
tools/ngui/static/bootstrap/js/bootstrap.min.js | 2 +-
tools/ngui/static/js/app/dashboard/dashboard.js | 1 -
.../static/js/app/infrastructure/infrastructure.js | 1 -
tools/ngui/static/js/lib/angular.js | 2 +-
tools/transifex/.tx/config | 1 -
tools/transifex/sync-transifex-ui.sh | 1 -
.../database_comparision_during_upgrade/README | 1 -
.../before_upgrade_data_collection.sh | 2 -
.../fresh_install_data_collection.sh | 1 -
.../test_config_before_and_after_upgrade.sh | 1 -
...test_config_between_fresh_and_upgraded_setup.sh | 13 -
.../usage_schema_comparison.sh | 1 -
tools/whisker/LICENSE | 1 -
ui/.babelrc | 2 +-
ui/.gitattributes | 2 +-
ui/public/assets/banner.svg | 2 +-
ui/public/assets/logo.svg | 2 +-
ui/public/assets/mini-logo.svg | 2 +-
ui/public/config.json | 2 +-
ui/public/js/less.min.js | 2 +-
ui/public/locales/ar.json | 2 +-
ui/public/locales/ca.json | 2 +-
ui/public/locales/de_DE.json | 2 +-
ui/public/locales/el_GR.json | 2 +-
ui/public/locales/en.json | 2 +-
ui/public/locales/es.json | 2 +-
ui/public/locales/fr_FR.json | 2 +-
ui/public/locales/hi.json | 2 +-
ui/public/locales/hu.json | 2 +-
ui/public/locales/it_IT.json | 2 +-
ui/public/locales/ko_KR.json | 2 +-
ui/public/locales/nb_NO.json | 2 +-
ui/public/locales/nl_NL.json | 2 +-
ui/public/locales/pl.json | 2 +-
ui/public/locales/pt_BR.json | 2 +-
ui/public/locales/ru_RU.json | 2 +-
ui/public/locales/zh_CN.json | 2 +-
ui/src/assets/icons/dark.svg | 2 +-
ui/src/assets/icons/debian.svg | 2 +-
ui/src/assets/icons/kubernetes.svg | 2 +-
ui/src/assets/icons/light.svg | 2 +-
ui/src/components/multitab/index.less | 2 +-
ui/src/components/view/DetailSettings.vue | 6 +-
ui/src/style/common/function.less | 2 +-
ui/src/style/dark-mode.less | 2 +-
ui/src/style/frame/content.less | 2 +-
ui/src/style/frame/search.less | 2 +-
ui/src/style/frame/sider.less | 2 +-
ui/src/style/frame/top-menu.less | 2 +-
ui/src/style/objects/table.less | 2 +-
ui/src/style/vars.less | 2 +-
ui/src/views/compute/EditVM.vue | 6 +-
ui/tests/mockData/ActionButton.mock.json | 2 +-
ui/tests/mockData/MigrateWizard.mock.json | 2 +-
ui/tests/unit/views/AutogenView.spec.js | 7 +-
.../hypervisor/vmware/mo/DatastoreMOTest.java | 45 ++--
.../com/cloud/hypervisor/vmware/mo/HostMOTest.java | 50 ++--
.../vmware/mo/HypervisorHostHelperTest.java | 17 +-
.../hypervisor/vmware/mo/VirtualMachineMOTest.java | 15 +-
.../hypervisor/vmware/util/VmwareContextTest.java | 5 +-
.../hypervisor/vmware/util/VmwareHelperTest.java | 5 +-
.../org.mockito.plugins.MockMaker | 0
406 files changed, 796 insertions(+), 1007 deletions(-)
copy {agent =>
plugins/database/quota}/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
(100%)
copy {agent =>
plugins/hypervisors/vmware}/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
(100%)
copy {agent =>
plugins/hypervisors/xenserver}/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
(100%)
copy {agent =>
vmware-base}/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
(100%)
