From: Sage Weil <sage@redhat.com>
Date: Thu, 3 Jan 2019 15:03:39 +0000 (-0600)
Subject: Merge PR #25736 into master
X-Git-Tag: v14.1.0~505
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8cbaac69cf291d4e176e7353fab79c3a6f5ae850;p=ceph.git

Merge PR #25736 into master

* refs/pull/25736/head:
	common/options: document some osd/rados options
	unittest_osdmap: feed options as defaults
	mon/OSDMonitor: allow osd_pool_default_pgp_num to be 0

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

8cbaac69cf291d4e176e7353fab79c3a6f5ae850