]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
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)
commite920693ff6e5d9fe2b64965e9c729d1c7801b870
tree1acd40352033d5afd60b699e9ecc1f1f610abc2d
parentcf9deaf8f8954d81ce6f6edd0976064aabb86b90
parent1f2eef7f1fbb842c63aab3e8561d700ecf7a09ea
Merge pull request #25529 from Songweibin/wip-fix-rbd-migration

librbd: disallow trash restoring when image being migrated

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