From: Patrick Donnelly <pdonnell@ibm.com>
Date: Thu, 28 May 2026 23:48:14 +0000 (-0400)
Subject: Merge PR #68936 into main
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=44fa2a5d857509dd8c12b0ef50035bb3ca60341b;p=ceph.git

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>
---

44fa2a5d857509dd8c12b0ef50035bb3ca60341b
diff --cc .githubmap
index d34e9d9a0bdf,d34e9d9a0bdf..78f91284a5eb
--- a/.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>