]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
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)
commitea0408778625106cd5e1346d1769aae09133fef3
tree3394d082a37a6d72ece929e9443c1a92deafaebf
parentc434eb660bf5603d9effc32a95b7d5128e341541
parente1ccf367dff0b9d57bd5c50477cfa60c76c64762
Merge PR #42371 into master

* 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>