]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 92843bf) | patch
librbd: allow mirroring trash images to be restored
authorJason Dillaman <dillaman@redhat.com>
Wed, 11 Sep 2019 18:07:23 +0000 (14:07 -0400)
committerJason Dillaman <dillaman@redhat.com>
Wed, 9 Oct 2019 21:24:08 +0000 (17:24 -0400)
commit0d1fcf0975d2232a61f075dfd20e98f400b38bfe
tree3beb0c0ce3a90e151442e9e47a45dcead0dc4a6dtree | snapshot
parent92843bfba570d4e1d152e213c68a7112c8910134commit | diff
librbd: allow mirroring trash images to be restored

This functionality was accidentally broken when image live-migration
was introduced.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 0ef0f43da9d112c54e3f17ed786d7197f920b8a2)

Conflicts:
src/librbd/api/Trash.cc: TRASH_IMAGE_SOURCE_USER_PARENT not valid enum
src/librbd/api/Image.cc diff | blob | history
src/librbd/api/Migration.cc diff | blob | history
src/librbd/api/Trash.cc diff | blob | history
src/librbd/api/Trash.h diff | blob | history
src/librbd/librbd.cc diff | blob | history
src/test/librbd/test_Trash.cc diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.