]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
Merge PR #40394 into master
authorSage Weil <sage@newdream.net>
Fri, 26 Mar 2021 20:41:31 +0000 (16:41 -0400)
committerSage Weil <sage@newdream.net>
Fri, 26 Mar 2021 20:41:31 +0000 (16:41 -0400)
commit8350cc4596e0f7f47295a1b22d69f1eab67d1200
tree4fa116a7823f8cf46d3ed194110fa156b4870e08
parentfc330101d90eafd5f0385d1389bb6506da687a4a
parente4b7f4563a8d122056b9a01dda4219a13ae87db8
Merge PR #40394 into master

* refs/pull/40394/head:
osd: handle MOSDPGInfo
osd/PeeringState: init last_require_osd_release in ctor

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
src/osd/OSD.cc
src/osd/OSD.h