]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #24078 from Songweibin/wip-rbd-trash-state
authorJason Dillaman <dillaman@redhat.com>
Mon, 24 Sep 2018 14:19:13 +0000 (10:19 -0400)
committerGitHub <noreply@github.com>
Mon, 24 Sep 2018 14:19:13 +0000 (10:19 -0400)
rbd: not allowed to restore an image when it is being deleted

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
1  2 
src/cls/rbd/cls_rbd_client.h
src/librbd/internal.cc

Simple merge
Simple merge