]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge PR #30525 into master
authorSage Weil <sage@redhat.com>
Fri, 27 Sep 2019 17:08:37 +0000 (12:08 -0500)
committerSage Weil <sage@redhat.com>
Fri, 27 Sep 2019 17:08:37 +0000 (12:08 -0500)
* 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>
1  2 
PendingReleaseNotes
src/mon/OSDMonitor.cc
src/osd/OSDMap.cc

Simple merge
Simple merge
Simple merge