]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'upstream/pull/15950/head' into master
authorPatrick Donnelly <pdonnell@redhat.com>
Fri, 7 Jul 2017 05:11:18 +0000 (22:11 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Fri, 7 Jul 2017 05:11:18 +0000 (22:11 -0700)
* upstream/pull/15950/head:
  qa: update thrash max mds testing

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

Trivial merge