From: Patrick Donnelly <pdonnell@redhat.com>
Date: Fri, 7 Jul 2017 05:14:32 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/pull/15822/head' into master
X-Git-Tag: v12.1.1~145
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5b873011925d1aba8d8c8885260274bf877b6b4f;p=ceph.git

Merge remote-tracking branch 'upstream/pull/15822/head' into master

* upstream/pull/15822/head:
  qa: add timeout/repeat to pool df

Reviewed-by: John Spray <jspray@redhat.com>
---

5b873011925d1aba8d8c8885260274bf877b6b4f