From: Sage Weil <sage@redhat.com>
Date: Sat, 8 Sep 2018 00:34:00 +0000 (-0500)
Subject: Merge PR #23449 into master
X-Git-Tag: v14.0.1~369
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=3eaf9374596c10c55859d49bd629477fa224bd11;p=ceph-ci.git

Merge PR #23449 into master

* refs/pull/23449/head:
	osd/OSDMap: cleanup: s/tmpmap/nextmap/
	qa/standalone/osd/osd-backfill-stats: fixes
	osd/OSDMap: clean out pg_temp mappings that exceed pool size
	mon/OSDMonitor: clean temps and upmaps in encode_pending, efficiently
	osd/OSDMapMapping: do not crash if acting > pool size

Reviewed-by: David Zafman <dzafman@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Neha Ojha <nojha@redhat.com>
---

3eaf9374596c10c55859d49bd629477fa224bd11