]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #8857 from liewegas/wip-15678
authorYuri Weinstein <yuri.weinstein@gmail.com>
Mon, 9 May 2016 16:09:13 +0000 (09:09 -0700)
committerYuri Weinstein <yuri.weinstein@gmail.com>
Mon, 9 May 2016 16:09:13 +0000 (09:09 -0700)
osd: handle boot racing with NOUP set

test run http://pulpito.ceph.com/yuriw-2016-05-07_09:11:04-rados-wip-yuri-testing---basic-smithi/

1  2 
src/osd/OSD.cc

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