]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c434eb6 e1ccf36)
Merge PR #42371 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Tue, 24 Aug 2021 00:02:31 +0000 (20:02 -0400)
committerPatrick Donnelly <pdonnell@redhat.com>
Tue, 24 Aug 2021 00:02:31 +0000 (20:02 -0400)
* refs/pull/42371/head:
mgr/volumes: Fix a race during clone cancel
mgr/volumes: Fail subvolume removal if it's in progress

Reviewed-by: Ramana Raja <rraja@redhat.com>
Reviewed-by: Venky Shankar <vshankar@redhat.com>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.