From: Sage Weil <sage@redhat.com>
Date: Tue, 16 Apr 2019 13:38:34 +0000 (-0500)
Subject: Merge PR #27564 into master
X-Git-Tag: v15.1.0~2925
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3859b35f9c6cdd1a2730b897f8a90d9192a88cd8;p=ceph.git

Merge PR #27564 into master

* 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>
---

3859b35f9c6cdd1a2730b897f8a90d9192a88cd8