Merge PR #68936 into main

* refs/pull/68936/head:
	osd: Fix bug when calculating min_peer_features

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@ibm.com>
Reviewed-by: Alex Ainscow <aainscow@uk.ibm.com>

diff --cc .githubmap
index d34e9d9a0bdfbbc2e65af12246b481864ef33926,d34e9d9a0bdfbbc2e65af12246b481864ef33926..78f91284a5ebdf407e1ef903ed0a48dcd28aeee8
--- 1/.githubmap
--- 2/.githubmap
+++ b/.githubmap
@@@ -211,3 -211,3 +211,4 @@@ ashjosh1git Ashwin M Joshi <ashjosh1@in
  mkogan1 Mark Kogan <mkogan@redhat.com>
  smanjara Shilpa Jagannath <smanjara@redhat.com>
  arbtfnf anuragbandhu <anuragbandhu007@gmail.com>
++aainscow Alex Ainscow <aainscow@uk.ibm.com>

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