From: Sage Weil <sage@redhat.com>
Date: Tue, 30 Oct 2018 20:09:45 +0000 (-0500)
Subject: Merge PR #24809 into master
X-Git-Tag: v14.1.0~1037
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9ab9dcfc0da59ac2dbd711f4300f1bee875ee616;p=ceph.git

Merge PR #24809 into master

* refs/pull/24809/head:
	os/bluestore: omit redundant '/' in OSD path for ceph-bluestore-tool if
	os/bluestore: improve error handling for migrate ops in
	qa/standtalone/osd-bluefs-volume-ops: remove redundant code.

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

9ab9dcfc0da59ac2dbd711f4300f1bee875ee616