This is an automated email from the ASF dual-hosted git repository. sureshanaparti pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 04b58acdd64e62f53a2bcc519f0e24cc27c617f2 Merge: 8b2f1f19c27 3828a3b744a Author: Suresh Kumar Anaparti <[email protected]> AuthorDate: Mon Jan 19 19:50:51 2026 +0530 Merge branch '4.22' .../subsystem/api/storage/SnapshotDataFactory.java | 2 + .../java/com/cloud/storage/dao/SnapshotDao.java | 2 + .../com/cloud/storage/dao/SnapshotDaoImpl.java | 7 ++ .../java/com/cloud/usage/dao/UsageDaoImpl.java | 17 ++-- .../storage/datastore/db/SnapshotDataStoreDao.java | 2 + .../datastore/db/SnapshotDataStoreDaoImpl.java | 7 ++ .../storage/snapshot/DefaultSnapshotStrategy.java | 2 +- .../storage/snapshot/SnapshotDataFactoryImpl.java | 22 ++++- .../storage/snapshot/SnapshotServiceImpl.java | 9 +- .../snapshot/StorageSystemSnapshotStrategy.java | 1 - .../datastore/ObjectInDataStoreManagerImpl.java | 3 + .../storage/datastore/util/StorPoolHelper.java | 2 +- .../storage/snapshot/StorPoolSnapshotStrategy.java | 4 +- .../java/com/cloud/storage/StorageManagerImpl.java | 101 +++++++++++---------- .../storage/snapshot/SnapshotManagerImpl.java | 31 +++---- .../storage/snapshot/SnapshotManagerImplTest.java | 4 +- ui/src/views/compute/DeployVM.vue | 4 +- ui/src/views/compute/wizard/OwnershipSelection.vue | 30 +++++- ui/src/views/network/CreateIsolatedNetworkForm.vue | 2 +- ui/src/views/network/CreateL2NetworkForm.vue | 2 +- ui/src/views/storage/CreateSharedFS.vue | 8 +- ui/src/views/storage/CreateVolume.vue | 4 +- 22 files changed, 162 insertions(+), 104 deletions(-)
