]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #36448 into nautilus
authorPatrick Donnelly <pdonnell@redhat.com>
Wed, 19 Aug 2020 20:49:00 +0000 (13:49 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Wed, 19 Aug 2020 20:49:00 +0000 (13:49 -0700)
* refs/pull/36448/head:
mgr: Add python-enum34 dependency to package for older distributions
mgr/volumes: Add documentation regarding --retain-snapshots option
mgr/volumes: Avoid trashing retained subvolume on create errors
mgr/volumes: Add subvolume v2 test cases
mgr/volumes: Derive v2 from v1 to leverage common methods
mgr/volumes: Introduce v2 subvolumes
mgr/volumes: Use operation type during subvolume open

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>

Trivial merge