From: Sage Weil <sage@redhat.com>
Date: Fri, 27 Sep 2019 17:08:37 +0000 (-0500)
Subject: Merge PR #30525 into master
X-Git-Tag: v15.1.0~1388
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dff5697464edb9931d5dfa08cd4a30f85c1f237e;p=ceph.git

Merge PR #30525 into master

* refs/pull/30525/head:
	qa/tasks/ceph.conf.template: disable power-of-2 warning
	qa/standalone/mon/health-mute: use power of 2 for pg_num
	osd/OSDMap: remove remaining g_conf() usage
	PendingReleaseNotes: add note for 14.2.5 so we can backport this
	osd/OSDMap: health alert for non-power-of-two pg_num

Reviewed-by: Kai Wagner <kwagner@suse.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
---

dff5697464edb9931d5dfa08cd4a30f85c1f237e