From: Gregory Farnum <greg@gregs42.com>
Date: Tue, 16 Feb 2016 04:35:32 +0000 (-0800)
Subject: Merge pull request #7616 from gregsfortytwo/wip-timer-14697
X-Git-Tag: v10.1.0~374
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=42afb5b523e3253d0d2fb94252af9df45c964377;p=ceph.git

Merge pull request #7616 from gregsfortytwo/wip-timer-14697

mds: don't double-shutdown the timer when suiciding

Reviewed-by: John Spray <john.spray@redhat.com>
---

42afb5b523e3253d0d2fb94252af9df45c964377