]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #7041 from dillaman/wip-14165
authorJosh Durgin <jdurgin@redhat.com>
Wed, 23 Dec 2015 18:51:17 +0000 (10:51 -0800)
committerJosh Durgin <jdurgin@redhat.com>
Wed, 23 Dec 2015 18:51:17 +0000 (10:51 -0800)
qa/workunits: merge_diff shouldn't attempt to use striping

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

Trivial merge