From: Sage Weil <sage@redhat.com>
Date: Fri, 18 Jan 2019 00:51:16 +0000 (-0600)
Subject: Merge PR #25937 into master
X-Git-Tag: v14.1.0~359
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4f48314a7adfa08acf2e79b3872f33a092e75893;p=ceph.git

Merge PR #25937 into master

* refs/pull/25937/head:
	qa: specify filestore for misc tests
	osd/objectstore: change osd_objectstore default to bluestore

Reviewed-by: Neha Ojha <nojha@redhat.com>
---

4f48314a7adfa08acf2e79b3872f33a092e75893