From: Sage Weil <sage@redhat.com>
Date: Thu, 27 Feb 2020 16:24:46 +0000 (-0600)
Subject: Merge PR #33574 into master
X-Git-Tag: v15.1.1~225
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9fb5f423ad9653b2bfe5af39ed0b8d22cc93f7c8;p=ceph.git

Merge PR #33574 into master

* refs/pull/33574/head:
	doc/mgr/orchestrator: Add CephFS
	doc/mgr/orchestrator: Add documentation for plcement specs
	doc/mgr: Reordering

Reviewed-by: Alexandra Settle <asettle@suse.com>
Reviewed-by: Sage Weil <sage@redhat.com>
---

9fb5f423ad9653b2bfe5af39ed0b8d22cc93f7c8