From: Sage Weil <sage@redhat.com>
Date: Sat, 2 Mar 2019 14:31:54 +0000 (-0600)
Subject: Merge PR #26720 into master
X-Git-Tag: v14.1.1~79
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=5de132944a0c793d59c8e26440c44907fa6adad8;p=ceph-ci.git

Merge PR #26720 into master

* refs/pull/26720/head:
	ceph-osd: infer objectstore type of 'type' file is missing

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

5de132944a0c793d59c8e26440c44907fa6adad8