]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge pull request #8868 from Abhishekvrshny/wip-15666-jewel
authorJason Dillaman <dillaman@redhat.com>
Tue, 10 May 2016 16:35:41 +0000 (12:35 -0400)
committerJason Dillaman <dillaman@redhat.com>
Tue, 10 May 2016 16:43:28 +0000 (12:43 -0400)
commit978f30e100fa91c148fd2aeaadad2f6e7bb94f9a
tree9f77f785dc3334e30991fc534c10b421c2d68158
parent1dceb38538d9c8a13551ef8b9217cb5757089576
parent32c09015a16ef8dee535d2c81825a2590f7f15e7
Merge pull request #8868 from Abhishekvrshny/wip-15666-jewel

jewel: rbd CLI to retrieve rbd mirror state for a pool / specific image

Conflicts:
src/tools/rbd_mirror/ImageReplayer.cc: trivial resolution

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
src/librbd/internal.cc
src/tools/rbd_mirror/ImageReplayer.cc