From: Patrick Donnelly <pdonnell@redhat.com>
Date: Wed, 6 Sep 2017 21:45:12 +0000 (-0700)
Subject: Merge PR #17219 into master
X-Git-Tag: v13.0.1~1024
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8f79a7eccc75ecdb1a93ec04e3fdfb92d9f9344a;p=ceph.git

Merge PR #17219 into master

* refs/remotes/upstream/pull/17219/head:
	mds: fix StrayManager::truncate()

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

8f79a7eccc75ecdb1a93ec04e3fdfb92d9f9344a