]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #25529 from Songweibin/wip-fix-rbd-migration
authorJason Dillaman <dillaman@redhat.com>
Fri, 11 Jan 2019 14:03:58 +0000 (09:03 -0500)
committerGitHub <noreply@github.com>
Fri, 11 Jan 2019 14:03:58 +0000 (09:03 -0500)
librbd: disallow trash restoring when image being migrated

Reviewed-by: Mykola Golub <mgolub@suse.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
1  2 
src/librbd/api/Migration.cc
src/librbd/api/Trash.cc
src/librbd/librbd.cc
src/test/librbd/test_librbd.cc

Simple merge
Simple merge
Simple merge
Simple merge