From: Patrick Donnelly <pdonnell@redhat.com>
Date: Fri, 21 Sep 2018 20:01:14 +0000 (-0700)
Subject: Merge PR #24157 into master
X-Git-Tag: v14.0.1~207
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F24223%2Fhead;p=ceph.git

Merge PR #24157 into master

* refs/pull/24157/head:
	qa: cleanup parallel execution of fsstress

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
---

9e9f3ead363c8bd0d39625295ec6d9a33eb65401
diff --cc .githubmap
index e298d427cc0c,4086d0b82bd5..3132cd3814ca
--- a/.githubmap
+++ b/.githubmap
@@@ -81,4 -81,4 +81,5 @@@ rishabh-d-dave Rishabh Dave <ridave@red
  neha-ojha Neha Ojha <nojha@redhat.com>
  vshankar Venky Shankar <vshankar@redhat.com>
  adamemerson Adam C. Emerson <aemerson@redhat.com>
 +myoungwon git push gh masterMyoungwon Oh <omwmw@sk.com>
+ dillaman Jason Dillaman <dillaman@redhat.com>