From: Patrick Donnelly <pdonnell@redhat.com>
Date: Tue, 18 Jul 2017 05:33:45 +0000 (-0700)
Subject: Merge PR 16153 into master
X-Git-Tag: ses5-milestone9~1^2~24
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=64069538d25e204f0a5e6486373d598475c79bf9;p=ceph.git

Merge PR 16153 into master

* refs/remotes/upstream/pull/16153/head:
	mds: fixup may be an unclaimed tick_event

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
---

64069538d25e204f0a5e6486373d598475c79bf9