From: Patrick Donnelly <pdonnell@redhat.com>
Date: Tue, 8 Jan 2019 15:03:40 +0000 (-0800)
Subject: Merge PR #25741 into master
X-Git-Tag: v14.1.0~467
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=112d75465009dd171f365a02438e3129fd30e76b;p=ceph-ci.git

Merge PR #25741 into master

* refs/pull/25741/head:
	mds: remove wrong assertion in Locker::snapflush_nudge

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

112d75465009dd171f365a02438e3129fd30e76b