]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge PR #52765 into main
authorVenky Shankar <vshankar@redhat.com>
Fri, 11 Aug 2023 06:09:52 +0000 (11:39 +0530)
committerVenky Shankar <vshankar@redhat.com>
Fri, 11 Aug 2023 06:09:52 +0000 (11:39 +0530)
* refs/pull/52765/head:
mgr/volumes: Fix pending_subvolume_deletions in volume info
qa: Add testcase for pending_subvolume_deletions count

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Neeraj Pratap Singh <neesingh@redhat.com>
1  2 
qa/tasks/cephfs/test_volumes.py
src/pybind/mgr/volumes/fs/fs_util.py
src/pybind/mgr/volumes/fs/operations/volume.py

Simple merge
Simple merge