From: Patrick Donnelly <pdonnell@ibm.com>
Date: Mon, 11 May 2026 12:20:40 +0000 (-0400)
Subject: Merge PR #68415 into tentacle
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d866558258812653cb2a2666a5f0ea4d6f1be6a7;p=ceph.git

Merge PR #68415 into tentacle

* refs/pull/68415/head:
	nvmeof: Change the NVMEOF image version to 1.6

Reviewed-by: Aviv.Caro@ibm.com
---

d866558258812653cb2a2666a5f0ea4d6f1be6a7
diff --cc .githubmap
index cc9115bf70dc,bce0c48bf845..3f7a252fe96e
--- a/.githubmap
+++ b/.githubmap
@@@ -199,11 -199,3 +199,12 @@@ 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>
 +aainscow Alex Ainscow <aainscow@uk.ibm.com>
 +Hezko Tomer Haskalovitch <tomer.haska@ibm.com>
 +aainscow Alex Ainscow <aainscow@uk.ibm.com>
++caroav Aviv.Caro@ibm.com