From: Yuri Weinstein Date: Wed, 14 Dec 2016 21:48:28 +0000 (-0800) Subject: Merge pull request #12461 from liupan1111/wip-replace-atomic X-Git-Tag: v11.1.1~60 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=167b3e1dc56ee42f076f99339b745cd2af8496fa;p=ceph.git Merge pull request #12461 from liupan1111/wip-replace-atomic osd: remove the lock heartbeat_update_lock, and change heatbeat_need_… Reviewed-by: Kefu Chai --- 167b3e1dc56ee42f076f99339b745cd2af8496fa