]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #5783 from dzafman/wip-12738
authorDavid Zafman <dzafman@redhat.com>
Fri, 30 Oct 2015 20:14:49 +0000 (13:14 -0700)
committerDavid Zafman <dzafman@redhat.com>
Fri, 30 Oct 2015 20:14:49 +0000 (13:14 -0700)
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 <kchai@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>

Trivial merge