From: Patrick Donnelly Date: Thu, 27 Aug 2020 20:43:01 +0000 (-0700) Subject: Merge PR #36833 into nautilus X-Git-Tag: v14.2.12~111 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3f4f4e7328eea16300cbfa3ed66cf55086c0faa9;p=ceph.git Merge PR #36833 into nautilus * refs/pull/36833/head: nautilus: mgr/volumes: convert uid and gid to integer type mgr/volumes: Address python breakage in python 2 mgr/volumes: Update doc/cephfs/fs-volumes.rst for nautilus mgr/volumes: Prevent subvolume recreate if trash is not-empty mgr/volumes: Disallow subvolume group level snapshots mgr/volumes: Add test case to ensure subvolume is marked mgr/volumes: handle idempotent subvolume marks mgr/volumes: Tests amended and added to ensure subvolume trash functionality mgr/volumes: Mark subvolume root with the vxattr ceph.dir.subvolume mgr/volumes: Move incarnations for v2 subvolumes, to subvolume trash mgr/volumes: maintain per subvolume trash directory mgr/volumes: make subvolume_v2::_is_retained() object property mgr/volumes: Use snapshot root directory attrs when creating clone root Reviewed-by: Patrick Donnelly --- 3f4f4e7328eea16300cbfa3ed66cf55086c0faa9