From: Patrick Donnelly <pdonnell@redhat.com>
Date: Mon, 4 May 2026 15:43:30 +0000 (-0700)
Subject: Merge PR #68347 into tentacle
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=17c6cbbf0d77328559d2b980666e4c13d028b5b0;p=ceph.git

Merge PR #68347 into tentacle

* refs/pull/68347/head:
	nvmeofgw: propagate quorum feature to the NVMeofMonClient,
	fix upgrade
	code review changes
	nvmeofgw: disaster set/clear command, introduced disaster-locations map,
	 nvmeofgw: added support to nvmeof stretched cluster:
	nvmeofgw: prevent map corruption while processing beacons from deleted gws
	mon: add NVMEOF_BEACON_DIFF to mon_feature_t and mon CompatSet
	nvmeofgw: beacon diff implementation in the monitor and in the MonClient.

Reviewed-by: Alexander Indenbaum <aindenba@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@ibm.com>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
---

17c6cbbf0d77328559d2b980666e4c13d028b5b0
diff --cc .githubmap
index 5be50b752e76,bce0c48bf845..5ee82cebbcac
--- a/.githubmap
+++ b/.githubmap
@@@ -199,7 -199,3 +199,8 @@@ xhernandez Xavi Hernandez <xhernandez@g
  caroav Aviv Caro <Aviv.Caro@ibm.com>
  ThomasLamprecht Thomas Lamprecht <t.lamprecht@proxmox.com>
  baum Alexander Indenbaum <aindenba@redhat.com>
 +asm0deuz Teoman Onay <tonay@ibm.com>
 +Hezko Tomer Haskalovitch <tomer.haska@ibm.com>
 +caroav Aviv Caro <Aviv.Caro@ibm.com>
 +Hezko Tomer Haskalovitch <tomer.haska@ibm.com>
++baum Alexander Indenbaum <aindenba@redhat.com>