]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge pull request #10548 from xiexingguo/xxg-wip-osd-2016-08-02
authorYuri Weinstein <yuri.weinstein@gmail.com>
Mon, 8 Aug 2016 23:24:16 +0000 (16:24 -0700)
committerGitHub <noreply@github.com>
Mon, 8 Aug 2016 23:24:16 +0000 (16:24 -0700)
osd: more cleanups

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

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