Merge pull request #15952 from jdurgin/wip-peering-deletes

osd: process deletes during recovery instead of peering

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

diff --cc src/mon/MonCommands.h
Simple merge

diff --cc src/mon/OSDMonitor.cc
Simple merge

diff --cc src/osd/OSD.cc
Simple merge

diff --cc src/osd/OSD.h
Simple merge

diff --cc src/osd/OSDMap.cc
Simple merge

diff --cc src/osd/osd_types.cc
Simple merge

diff --cc src/osd/osd_types.h
Simple merge