From: Sage Weil <sage@newdream.net>
Date: Tue, 13 Apr 2021 02:38:49 +0000 (-0400)
Subject: Merge PR #40626 into master
X-Git-Tag: v17.1.0~2274
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=dcd90a1c8d789d0f1ebea06f88d69096c5ea884a;p=ceph.git

Merge PR #40626 into master

* refs/pull/40626/head:
	qa/suites/rados/objectstore: separate store_test tests
	qa/standalone: split osd/ into 2 directories

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
---

dcd90a1c8d789d0f1ebea06f88d69096c5ea884a