From: Sage Weil <sage@redhat.com>
Date: Sat, 8 Feb 2020 14:10:57 +0000 (-0600)
Subject: Merge PR #33092 into master
X-Git-Tag: v15.1.1~501
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=12a0faa9fa0fbef02e72fd852e7bfe5dfbbbc12c;p=ceph.git

Merge PR #33092 into master

* refs/pull/33092/head:
	doc/rados/operations: adjust docs a bit
	mon/OSDMonitor: accept 'autoscale_mode' argument to 'osd pool create'

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

12a0faa9fa0fbef02e72fd852e7bfe5dfbbbc12c