]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #17219 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Wed, 6 Sep 2017 21:45:12 +0000 (14:45 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Wed, 6 Sep 2017 21:45:12 +0000 (14:45 -0700)
* refs/remotes/upstream/pull/17219/head:
mds: fix StrayManager::truncate()

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

Trivial merge