]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge pull request #7739 from xiexingguo/xxg-wip-14387
authorSage Weil <sage@redhat.com>
Tue, 1 Mar 2016 13:46:08 +0000 (08:46 -0500)
committerSage Weil <sage@redhat.com>
Tue, 1 Mar 2016 13:46:08 +0000 (08:46 -0500)
commit149f01f3d8fcc767db952e21a6cf5c9e44878053
tree21d56d69c6fe96f173bb38dbb6a22dcd284c8c33
parentef5973324b1697e9d2214b6a0bdaf708cf096132
parent0914246383f8bfefb15e05a49c67b8b3091d50cf
Merge pull request #7739 from xiexingguo/xxg-wip-14387

osd: fix race condition for heartbeat_need_update

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