]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge pull request #8535 from asheplyakov/bug-14512-hammer
authorLoic Dachary <loic@dachary.org>
Mon, 16 May 2016 11:02:44 +0000 (13:02 +0200)
committerLoic Dachary <loic@dachary.org>
Mon, 16 May 2016 11:02:44 +0000 (13:02 +0200)
commitb90c097ddd3e172df4534509309a554cb3bc3917
tree0deac1407819650b75a3a6170eee9dd6473c58f0
parentaefe2cb4f262112f0a028797733f868b83da7bd2
parentaab3a40f95dafab34a7eadc2159d142a5f0f88f1
Merge pull request #8535 from asheplyakov/bug-14512-hammer

hammer: rbd snap rollback: restore the link to parent

Reviewed-by: Jason Dillaman <dillaman@redhat.com>