]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #8972 from Abhishekvrshny/wip-15697-jewel
authorJason Dillaman <dillaman@redhat.com>
Tue, 10 May 2016 16:53:00 +0000 (12:53 -0400)
committerJason Dillaman <dillaman@redhat.com>
Tue, 10 May 2016 16:53:00 +0000 (12:53 -0400)
jewel: python: clone operation will fail if config overridden with "rbd default format = 1"

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
1  2 
src/include/rbd/librbd.h
src/include/rbd/librbd.hpp
src/librbd/internal.cc
src/librbd/internal.h
src/librbd/librbd.cc

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge