From: David Zafman Date: Fri, 30 Oct 2015 20:14:49 +0000 (-0700) Subject: Merge pull request #5783 from dzafman/wip-12738 X-Git-Tag: v10.0.0~30 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=19565e19d8f6ffbc667bccf098711edc9dcbb96f;p=ceph.git Merge pull request #5783 from dzafman/wip-12738 Fix scrub error handling and log output Add set-size and remove-clone-metadata to ceph-objectstore-tool Fix trim_object() to not crash on corrupt snapset Add scrub clones test and add clones to ceph-objectstore-tool test Reviewed-by: Kefu Chai Reviewed-by: Samuel Just --- 19565e19d8f6ffbc667bccf098711edc9dcbb96f