]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #4035 from ceph/wip-11113
authorJosh Durgin <jdurgin@redhat.com>
Thu, 19 Mar 2015 18:47:55 +0000 (11:47 -0700)
committerJosh Durgin <jdurgin@redhat.com>
Thu, 19 Mar 2015 18:47:55 +0000 (11:47 -0700)
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
1  2 
src/librbd/internal.cc

Simple merge