This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit a2561df25b5ef0ae5eaf66be65574996995276e9
Merge: e234c3ccdc7 897dad619b8
Author: Rohit Yadav <rohit.ya...@shapeblue.com>
AuthorDate: Mon May 8 12:57:38 2023 +0530
Merge remote-tracking branch 'origin/4.18'
agent/bindir/libvirtqemuhook.in | 30 +++++-----
.../command/admin/annotation/AddAnnotationCmd.java | 2 +-
.../java/com/cloud/agent/api/MigrateCommand.java | 13 +++++
.../cloudstack/storage/to/TemplateObjectTO.java | 1 +
engine/schema/pom.xml | 6 --
.../upgrade/DatabaseVersionHierarchyTest.java | 22 ++++----
.../KvmNonManagedStorageDataMotionStrategy.java | 21 ++++++-
.../motion/StorageSystemDataMotionStrategy.java | 13 +++--
.../KvmNonManagedStorageSystemDataMotionTest.java | 15 ++++-
.../StorageSystemDataMotionStrategyTest.java | 15 ++++-
.../wrapper/LibvirtMigrateCommandWrapper.java | 10 ++++
.../wrapper/LibvirtMigrateCommandWrapperTest.java | 45 +++++++++++++++
.../configuration/ConfigurationManagerImpl.java | 28 ++++++++++
.../com/cloud/storage/VolumeApiServiceImpl.java | 2 +-
.../direct/download/DirectDownloadManagerImpl.java | 2 +-
.../ConfigurationManagerImplTest.java | 65 +++++++++++++++++++++-
systemvm/agent/noVNC/core/rfb.js | 35 +++++++-----
test/integration/component/test_configdrive.py | 2 +-
.../component/test_deploy_vm_userdata_multi_nic.py | 2 +-
.../component/test_deploy_vm_userdata_reg.py | 2 +-
tools/marvin/marvin/cloudstackConnection.py | 2 +-
tools/ngui/requester.py | 2 +-
ui/src/views/tools/ImportUnmanagedInstance.vue | 10 ++++
23 files changed, 282 insertions(+), 63 deletions(-)
diff --cc
engine/schema/src/test/java/com/cloud/upgrade/DatabaseVersionHierarchyTest.java
index 4825f15a933,e6692bdbde1..2b0dda5fa57
---
a/engine/schema/src/test/java/com/cloud/upgrade/DatabaseVersionHierarchyTest.java
+++
b/engine/schema/src/test/java/com/cloud/upgrade/DatabaseVersionHierarchyTest.java
@@@ -111,7 -111,7 +111,7 @@@ public class DatabaseVersionHierarchyTe
assertEquals("0.0.5",
hierarchy.getRecentVersion(CloudStackVersion.parse("0.0.9")).toString());
}
@Test
- void getRecentVersionExact() {
+ public void getRecentVersionExact() {
assertEquals("0.0.5",
hierarchy.getRecentVersion(CloudStackVersion.parse("1.0.0.0")).toString());
}
-}
+}
