]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'origin/jewel'
authorJosh Durgin <jdurgin@redhat.com>
Wed, 11 Nov 2015 19:51:49 +0000 (11:51 -0800)
committerJosh Durgin <jdurgin@redhat.com>
Wed, 11 Nov 2015 19:51:49 +0000 (11:51 -0800)
1  2 
src/librbd/ImageCtx.cc

Simple merge