From: Sage Weil <sage@redhat.com>
Date: Sat, 5 Jan 2019 18:01:23 +0000 (-0600)
Subject: Merge PR #25780 into master
X-Git-Tag: v14.1.0~480
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=1e6f0a125085a20057659abc4e371b19b17110d8;p=ceph-ci.git

Merge PR #25780 into master

* refs/pull/25780/head:
	mon/OSDMonitor: do not populate void pg_temp into nextmap

Reviewed-by: Sage Weil <sage@redhat.com>
---

1e6f0a125085a20057659abc4e371b19b17110d8