]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #27564 into master
authorSage Weil <sage@redhat.com>
Tue, 16 Apr 2019 13:38:34 +0000 (08:38 -0500)
committerSage Weil <sage@redhat.com>
Tue, 16 Apr 2019 13:38:34 +0000 (08:38 -0500)
* refs/pull/27564/head:
ceph-objectstore-tool: Rename dump-import to dump-export
osd: Fix fast path to use version bumped value

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>

Trivial merge