From: Sage Weil <sage@redhat.com>
Date: Fri, 30 Nov 2018 19:19:42 +0000 (-0600)
Subject: Merge PR #25308 into master
X-Git-Tag: v14.1.0~745
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5f7e083678378722c72e61b1ec01367c15adb671;p=ceph.git

Merge PR #25308 into master

* refs/pull/25308/head:
	osd/OSD: OSD::mkfs asserts when reusing disk with existing superblock.
	os/bluestore: add main device expand capability.

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

5f7e083678378722c72e61b1ec01367c15adb671