]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
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)
* refs/pull/25780/head:
mon/OSDMonitor: do not populate void pg_temp into nextmap

Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
src/mon/OSDMonitor.cc

Simple merge