]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-vumrao-12111' of https://github.com/vumrao/ceph
authorJosh Durgin <jdurgin@redhat.com>
Mon, 10 Aug 2015 06:01:01 +0000 (23:01 -0700)
committerJosh Durgin <jdurgin@redhat.com>
Mon, 10 Aug 2015 06:01:01 +0000 (23:01 -0700)
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
1  2 
src/rbd.cc

diff --cc src/rbd.cc
Simple merge