]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #10572 from xiexingguo/xxg-wip-osd-2016-08-04
authorYuri Weinstein <yuri.weinstein@gmail.com>
Mon, 22 Aug 2016 20:29:59 +0000 (13:29 -0700)
committerGitHub <noreply@github.com>
Mon, 22 Aug 2016 20:29:59 +0000 (13:29 -0700)
osd: miscellaneous fixes

Reviewed-by: Samuel Just <sjust@redhat.com>
1  2 
src/osd/OSD.cc

diff --cc src/osd/OSD.cc
Simple merge