]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge pull request #11337 from SUSE/wip-17060-jewel
authorLoic Dachary <loic@dachary.org>
Mon, 17 Oct 2016 15:37:41 +0000 (17:37 +0200)
committerGitHub <noreply@github.com>
Mon, 17 Oct 2016 15:37:41 +0000 (17:37 +0200)
commit51c279425e26626884ec54add6043c7ed3873920
tree083899dd875d099878ed81890415eb652453a9a2
parentee32be2ae3c328238fd2bbb953c18d3b9f0a51b1
parentbb81f9dd83da76704a5b6ba3e718fef3ac918290
Merge pull request #11337 from SUSE/wip-17060-jewel

jewel: librbd: cannot disable journaling or remove non-mirrored, non-primary image

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