From: Patrick Donnelly <pdonnell@ibm.com>
Date: Mon, 3 Mar 2025 13:34:58 +0000 (-0500)
Subject: Merge PR #61321 into main
X-Git-Tag: v20.3.0~469
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=58ab881ad5ffb18a4562b4d76528741d244eeaf9;p=ceph.git

Merge PR #61321 into main

* refs/pull/61321/head:
	qa: update require-osd-release to tentacle
	tools/monmaptool: bump new cluster version to X
	doc/dev/release-checklists: remove ceph-container task
	script/ceph-release-notes: add squid/tentacle
	doc/dev/release-checklists:: mark task complete
	doc/dev/release-checklist: add nightlies task
	doc/dev/release-checklists: update ceph-build for tentacle
	doc/dev/release-checklists: note redmine is done
	qa: update to tentacle
	doc/dev/release-checklist: question telemetry tentacle test
	osd/OSDMap: update to tentacle
	qa/workunits/cephtool/test: update to tentacle
	mon/OSDMonitor: update to tentacle
	common/options/global.yaml.in: update for tentacle
	mon/MgrMonitor: update for tentacle
	qa/standalone/mon/misc: update for tentacle
	doc: update compatset for tentacle
	doc: no deprecated features
	include/ceph_features: add SERVER_TENTACLE feature bit
	cephadm,ceph-volume: update to tentacle
	doc/dev/release-checklist: add backport-create-issue
	script: update backport-resolve-issue to tentacle
	*: add constants and release names
	ceph_release: update to tentacle
	librbd: bump version
	CMakeLists.txt: update VERSION
	doc: remove obsolete checklist item
	doc: reset for tentacle

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Reviewed-by: Bill Scales <bill_scales@uk.ibm.com>
Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
---

58ab881ad5ffb18a4562b4d76528741d244eeaf9
diff --cc .githubmap
index a34c3395ade2,a34c3395ade2..39c69763d075
--- a/.githubmap
+++ b/.githubmap
@@@ -192,3 -192,3 +192,4 @@@ Jayaprakash-ibm Jaya Prakash Madaka <ja
  spuiuk Sachin Prabhu <sp@spui.uk>
  anoopcs9 Anoop C S <anoopcs@cryptolab.net>
  dubeyko Viacheslav Dubeyko <Slava.Dubeyko@ibm.com>
++bill-scales Bill Scales <bill_scales@uk.ibm.com>