From: Josh Durgin <jdurgin@redhat.com>
Date: Wed, 23 Dec 2015 18:51:17 +0000 (-0800)
Subject: Merge pull request #7041 from dillaman/wip-14165
X-Git-Tag: v10.0.3~172
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5657f5bfa2d5a711b9a6ca9867e3c9ba04d95245;p=ceph.git

Merge pull request #7041 from dillaman/wip-14165

qa/workunits: merge_diff shouldn't attempt to use striping

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
---

5657f5bfa2d5a711b9a6ca9867e3c9ba04d95245