From: Patrick Donnelly <pdonnell@redhat.com>
Date: Fri, 22 Sep 2017 16:53:43 +0000 (-0700)
Subject: Merge PR #17878 into luminous
X-Git-Tag: v12.2.1~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=793b89dc80c82a0f3027210d894dd1b4be6cc12b;p=ceph.git

Merge PR #17878 into luminous

* refs/remotes/upstream/pull/17878/head:
	qa/cephfs: Fix error in test_filtered_df

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

793b89dc80c82a0f3027210d894dd1b4be6cc12b