]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
Merge PR #25780 into master
authorSage Weil <sage@redhat.com>
Sat, 5 Jan 2019 18:01:23 +0000 (12:01 -0600)
committerSage Weil <sage@redhat.com>
Sat, 5 Jan 2019 18:01:23 +0000 (12:01 -0600)
commit1e6f0a125085a20057659abc4e371b19b17110d8
treec1491df004aad8e1f9a027708f796d69469ab605
parent43b6c3296478b8557ab3d7daade965defbf02dd3
parentb1d3ca5e78eaee509c923f06e9024c23cc6ce31a
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>
src/mon/OSDMonitor.cc