]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge pull request #1798 from ceph/wip-8319
authorSage Weil <sage@inktank.com>
Fri, 9 May 2014 17:45:42 +0000 (10:45 -0700)
committerSage Weil <sage@inktank.com>
Fri, 9 May 2014 17:45:42 +0000 (10:45 -0700)
commit47f5dc0676530637cc09f8847dc823eb586cefa5
tree64f436e7edf3976070c2ead7630a70a66e05429b
parent4ef7fa9f3000945982a072046e1e274c9b07f34a
parent6b858be0676f937a99dbd51321497f30c3a0097f
Merge pull request #1798 from ceph/wip-8319

osd: fix race during shutdown

Reviewed-by: Samuel Just <sam.just@inktank.com>
src/osd/OSD.cc
src/osd/OSD.h