Merge branch 'stable'

diff --cc src/cauthtool.cc
Simple merge

diff --cc src/cosd.cc
Simple merge

diff --cc src/crushtool.cc
Simple merge

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

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

diff --cc src/osd/PG.cc
index 445fa38c7335dfc98a57024791786191316d580b,27e85f82227b361b0bfa27c324ba1157ddb6911f..e105d133f262fa38111285d8b27a50bf86135b2a
--- 1/src/osd/PG.cc
--- 2/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@@ -3633,8 -3719,10 +3719,10 @@@ void PG::Missing::add_next_event(Log::E
      } else if (missing.count(e.soid)) {
        // already missing (prior).
        //assert(missing[e.soid].need == e.prior_version);
 -      rmissing.erase(missing[e.soid].need);
 +      rmissing.erase(missing[e.soid].need.version);
        missing[e.soid].need = e.version;  // leave .have unchanged.
+     } else if (e.is_backlog()) {
+       missing[e.soid].need = e.version;
      } else {
        // not missing, we must have prior_version (if any)
        missing[e.soid] = item(e.version, e.prior_version);
@@@ -3651,8 -3739,10 +3739,10 @@@ void PG::Missing::add_event(Log::Entry
        if (missing[e.soid].need >= e.version)
        return;   // already missing same or newer.
        // missing older, revise need
 -      rmissing.erase(missing[e.soid].need);
 +      rmissing.erase(missing[e.soid].need.version);
        missing[e.soid].need = e.version;
+     } else if (e.is_backlog()) {
+       missing[e.soid].need = e.version;
      } else
        // not missing => have prior_version (if any)
        missing[e.soid] = item(e.version, e.prior_version);

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

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

diff --cc src/vstart.sh
Simple merge