]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
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)
commitae18bcb7196ef5f27bb76b51a99074d59f4f6778
tree9aef1a667e7a26d17fb31db15c6b993ffb56f80e
parent91bf56e26bf1b2b1d83f020d895230fa5d0607fc
parent69bcac513a7290b36f25b2a5a96bca683f6b6289
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>