]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #6972 from dillaman/wip-14106-jewel
authorJosh Durgin <jdurgin@redhat.com>
Fri, 18 Dec 2015 16:46:55 +0000 (08:46 -0800)
committerJosh Durgin <jdurgin@redhat.com>
Fri, 18 Dec 2015 16:46:55 +0000 (08:46 -0800)
rbd: merge_diff test should use new --object-size parameter instead of --order

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

Trivial merge