From: Josh Durgin <jdurgin@redhat.com>
Date: Fri, 18 Dec 2015 16:46:55 +0000 (-0800)
Subject: Merge pull request #6972 from dillaman/wip-14106-jewel
X-Git-Tag: v10.0.2~24
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ae18bcb7196ef5f27bb76b51a99074d59f4f6778;p=ceph.git

Merge pull request #6972 from dillaman/wip-14106-jewel

rbd: merge_diff test should use new --object-size parameter instead of --order

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

ae18bcb7196ef5f27bb76b51a99074d59f4f6778