From: Gregory Farnum Date: Tue, 27 Jan 2015 17:40:16 +0000 (-0800) Subject: Merge pull request #3502 from ceph/wip-10382-giant X-Git-Tag: v0.87.1~36 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e045ad4a39076547209ac1dc298df5ebffb76669;p=ceph.git Merge pull request #3502 from ceph/wip-10382-giant [giant backport] mds: handle heartbeat_reset during shutdown Reviewed-by: Greg Farnum --- e045ad4a39076547209ac1dc298df5ebffb76669