From: Patrick Donnelly <pdonnell@redhat.com>
Date: Fri, 11 May 2018 21:57:36 +0000 (-0700)
Subject: Merge PR #21923 into master
X-Git-Tag: v14.0.0~149
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=52707c33fe0e4712592c79e540c6653ffadb9482;p=ceph.git

Merge PR #21923 into master

* refs/pull/21923/head:
	mds: set could_consume to false when no purge queue item actually executed

Reviewed-by: Zheng Yan <zyan@redhat.com>
---

52707c33fe0e4712592c79e540c6653ffadb9482