]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge branch 'wip-13990' of git://github.com/tchaikov/ceph
authorSage Weil <sage@redhat.com>
Fri, 18 Mar 2016 01:46:45 +0000 (21:46 -0400)
committerSage Weil <sage@redhat.com>
Fri, 18 Mar 2016 01:46:45 +0000 (21:46 -0400)
commite50ba1140d9d463fb156e81a7e19c0c2ad0785bf
tree486db9916648d916bc9b454ebb70f75659d64edf
parent122e6d6be925099ec048f3110b4206c0744e94b0
parent9789c29fe0f82b236703f7ae4d356251fde3a46f
Merge branch 'wip-13990' of git://github.com/tchaikov/ceph

Reviewed-by: Sage Weil <sage@redhat.com>
src/osd/OSD.cc
src/osd/OSD.h