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

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

* upstream/pull/15950/head:
  qa: update thrash max mds testing

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

77b707a6eaf5d45983288c46f06feb485b7fc6f2