]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #3502 from ceph/wip-10382-giant
authorGregory Farnum <greg@gregs42.com>
Tue, 27 Jan 2015 17:40:16 +0000 (09:40 -0800)
committerGregory Farnum <greg@gregs42.com>
Tue, 27 Jan 2015 17:40:16 +0000 (09:40 -0800)
[giant backport] mds: handle heartbeat_reset during shutdown

Reviewed-by: Greg Farnum <gfarnum@redhat.com>

Trivial merge