rgw: Add documentation for the --pretty-format option

Fixes: http://tracker.ceph.com/issues/75988
Signed-off-by: Nathan Hoad <nhoad@bloomberg.net>

Merge pull request #68275 from VallariAg/fix-top-tool

mgr/dashboard: validate args in nvmeof top cmds

Reviewed-by: Afreen Misbah <afreen@ibm.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>

Merge pull request #68306 from shraddhaag/wip-shraddhaag-bad-machine-state-logs

src/osd: add more logs to the AllReplicasRecovered handler

Merge pull request #65917 from MattyWilliams22/wip-select-data-generator

test: Add option to select data generation type

Merge pull request #68329 from tchaikov/wip-mgr-codecs.open

mgr/dashboard: replace deprecated codecs.open with open

Reviewed-by: Nizamudeen A <nia@redhat.com>

Merge pull request #68166 from pdvian/wip-fix-mon-crash

ceph_mon: Fix shutdown order to destroy Monitor before closing mon store

Merge pull request #68043 from dheart-joe/master

BlueFS: _flush_and_sync_log_jump_D should validate that jump_to >= log.writer->pos

Merge pull request #66460 from MattyWilliams22/omap-rm-range

librados: Add omap_rm_range function to ObjectWriteOperation

Merge pull request #68048 from sseshasa/wip-fix-max-criteria-in-phase1

mgr/DaemonServer: Limit search for OSDs to upgrade within the crush bucket

Reviewed-by: Nitzan Mordechai <nmordech@redhat.com>
Reviewed-by: Kamoltat Sirivadhna <ksirivad@redhat.com>

Merge pull request #67388 from asm0deuz/stop_start_v2

cephadm: Automates the procedure to shutdown and bring up an entire Ceph cluster

Reviewed-by: Redouane Kachach <rkachach@ibm.com>

Merge pull request #68305 from rkachach/fix_teuthology_nfs_issue

qa/cephadm: fix NFS ganesha startup failure in containers

Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Shweta Bhosale <Shweta.Bhosale1@ibm.com>

Merge pull request #67622 from tchaikov/wip-qa-cephadm-ignore-failed-daemon

qa/cephadm: ignore transient CEPHADM_FAILED_DAEMON in smoke-singlehost

Reviewed-by: Laura Flores <lflores@redhat.com>
Reviewed-by: Adam King <adking@redhat.com>

Merge pull request #67584 from aainscow/osd-backend-test-infrastructure

OSD: Add EC backend test infrastructure with peering support

Reviewed-by: Bill Scales <bill_scales@uk.ibm.com>

Merge pull request #67443 from aainscow/ec-stretch-cluster-design

docs: First pass at EC stretch cluster design

Reviewed-by: Bill Scales <bill_scales@uk.ibm.com>
Reviewed-by: Anthony D'Atri <unknown@unknown.com>

Merge pull request #67951 from leonidc/propagate_quorum_features_to_client

Propagate quorum features to client

Merge pull request #67872 from rhcs-dashboard/75547-adding-msr-ec-profile-via-dashboard

mgr/dashboard:Adding MSR EC Profile via dashboard

Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Afreen Misbah <afreen@ibm.com>
Reviewed-by: Abhishek Desai <abhishek.desai1@ibm.com>

Merge pull request #68343 from gbregman/main

mgr/dashboard: Add location to gateway info command in NVMeoF CLI

mgr/dashboard: Add location to gateway info command in NVMeoF CLI
Fixes: https://tracker.ceph.com/issues/75968
Signed-off-by: Gil Bregman <gbregman@il.ibm.com>

mgr/dashboard: validate args in nvmeof top cmds

This commit makes these changes to nvmeof top tool:
1. Improve/cleanup help text
2. Rename args (--group, --server-addr, --subsystem) to
   (--gw-group, --server-address, --nqn) to match other nvmeof cmds
3. Validate args --period, --gw-group, --server-address, --sort-by
4. Remove --service arg (since group and service have 1-1 mapping, this is redundant)
5. Show all cpu stats if no args are passed to "ceph nvmeof top cpu"
6. Don't show busy/idle rate more than 100%

Fixes: https://tracker.ceph.com/issues/75927
Signed-off-by: Vallari Agrawal <vallari.agrawal@ibm.com>

Merge pull request #68303 from shraddhaag/wip-shraddhaag-debug-rocky10

container/build.sh: fix debug tag overwrite

Merge pull request #67817 from shraddhaag/wip-shraddhaag-add-objectstore-asok

crimson/osd/osd.cc: add osd_objectstore to OSD metadata

Reviewed-by: Jose J Palacios-Perez <perezjos@uk.ibm.com>

Merge pull request #68223 from tchaikov/crimson-cleanups

crimson/osd: use O_CLOEXEC with pipe2() in get_early_config

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Matan Breizman <mbreizma@redhat.com>

Merge pull request #68230 from gbregman/main

mgr/dashboard: Add namespace encryption support to NVMeoF CLI

Merge pull request #68327 from joscollin/wip-ptl-tool-fix

ptl-tool: drop deprecated codecs.open

Reviewed-by: Kefu Chai <k.chai@proxmox.com>

mgr/dashboard: replace deprecated codecs.open with open

codecs.open() was deprecated since Python 3.14, see
https://docs.python.org/3/library/codecs.html#codecs.open.
Let's use the builtin open() as recommended by the official
document.

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
Signed-off-by: Kefu Chai <k.chai@proxmox.com>

Merge pull request #64208 from wanglinke521/wlk-fix-iso

src/common: fix from_iso_8601 had no exception define

Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
Reviewed-by: Kefu Chai <k.chai@proxmox.com>

ptl-tool: drop deprecated codecs.open

Signed-off-by: Jos Collin <jcollin@redhat.com>

Merge pull request #68288 from lumir-sliva/qa/fix-cephadm-release-mismatch

qa/cephadm: derive container image from cephadm release

Reviewed-by: Redouane Kachach <rkachach@ibm.com>

docs: Stretch-EC design doc

Signed-off-by: Alex Ainscow <aainscow@uk.ibm.com>

mgr/dashboard: Add namespace encryption support to NVMeoF CLI
Fixes: https://tracker.ceph.com/issues/74965
Signed-off-by: Gil Bregman <gbregman@il.ibm.com>

Merge pull request #68114 from rhcs-dashboard/add-sync-from-zone

mgr/dashboard: Add option to edit zone with keys/argument like"sync_from" and "sync_from_all"

Reviewed-by: Naman Munet <nmunet@redhat.com>

Merge pull request #68150 from ronen-fr/wip-rf-addcounter

common/perf_counters: improve add() performance

Reviewed-by: Sridhar Seshasayee <sseshasa@redhat.com>
Reviewed-by: Kamoltat Sirivadhna <ksirivad@redhat.com>

Merge pull request #67759 from rhcs-dashboard/fix-layout-issue-subsystem

mgr/dashboard: Subsystem details page opens at stale scroll position after Add Namespace

Reviewed-by: Nizamudeen A <nia@redhat.com>

src/osd: add more logs to the AllReplicasRecovered handler

This PR adds more logs around AllReplicasRecovered Handler to
verify the race between this and defer recovery.

Signed-off-by: Shraddha Agrawal <shraddha.agrawal000@gmail.com>

qa/cephadm: fix NFS ganesha startup failure in containers

The test_cephadm.sh workunit deploys NFS using cephadm _orch deploy with
config_blobs sourced from src/cephadm/samples/nfs.json. The ganesha.conf
section in that sample has no NFS_CORE_PARAM block, so allow_set_io_flusher_fail
defaults to false.

On Rocky Linux 10 (the current base for ceph:main images), ganesha 7.0 calls
prctl(PR_SET_IO_FLUSHER) at startup. Containers lack the required capabilities
(CAP_SYS_ADMIN/CAP_SYS_RAWIO) for this syscall, so it returns EPERM. With
allow_set_io_flusher_fail unset, ganesha treats this as a fatal error and aborts
immediately, before even fetching the %url RADOS config.

The orchestrator path (ganesha.conf.j2) already has allow_set_io_flusher_fail = true
in its NFS_CORE_PARAM block. This fix brings the sample config used by the
standalone test path in line with it.

Fixes: workunits/{agent/on mon_election/connectivity
task/test_cephadm} failures

Signed-off-by: Redouane Kachach <rkachach@ibm.com>

container/build.sh: fix debug tag overwrite

This commit fixes an issue when the image is not the base distro,
the debug suffix for it is overwritten. This is especially
required for crimson debug builds to work for rocky10.

Fixes: https://tracker.ceph.com/issues/75952
Signed-off-by: Shraddha Agrawal <shraddha.agrawal000@gmail.com>

Merge pull request #68219 from rhcs-dashboard/75872-fixing-IOPs-values-as-whole-numbers

mgr/dashboard: 75872 fixing iops values as whole numbers

Reviewed-by: Aashish Sharma <aasharma@redhat.com>

Merge pull request #68285 from rkachach/fix_issue_75944

qa: fixing target release for MDS upgrade to be umbrella

Reviewed-by: Adam King <adking@redhat.com>

mgr/dashboard: Add option to edit zone with keys/
argument like"sync_from" and "sync_from_all"

Currently, there is no option to configure the sync_from and sync_from_all keys directly while creating or editing a zone from the dashboard. These arguments are particularly important when setting up archive zones. In archive zones, duplicate objects appear when sync_from_all is set to true (which is the default). The fix is to:
1.Set sync_from_all to false
2.Set sync_from to point to the master zone only
This ensures that the archive zone syncs exclusively from the master zone, preventing duplicate object issues.

Fixes: https://tracker.ceph.com/issues/75950
Signed-off-by: Aashish Sharma <aasharma@redhat.com>

Merge pull request #67842 from yzaken/fix_raw_osd_prepare_command

python-common: fix raw OSD prepare to use osd-id instead of osd-ids

Merge pull request #68281 from rkachach/fix_nvmeof_smoke_test

qa: fixing nvmeof orch smoke test

Reviewed-by: Adam King <adking@redhat.com>

Merge pull request #67803 from Annmool/fix-75404-border-subtle

fixes #75404 from trackers:mgr/dashboard: use border-subtle utility class in overview and tearsheet

Reviewed-by: Afreen Misbah <afreen@ibm.com>

Merge pull request #68269 from kshtsk/wip-rgw-crypt-kmip

qa/rgw: Revive crypt kmip

Reviewed-by: Casey Bodley <cbodley@redhat.com>

nvmeofgw: propagate quorum feature to the NVMeofMonClient,
          reverted feature bit NVMEOF_BEACON_DIFF:

   -NVMeofGwMon adds a quorum_features indication to the MonClient map.
   -MonClient initially sends beacons without applying the BEACON_DIFF logic.
   -MonClient begins applying the BEACON_DIFF logic only when the BEACON_DIFF bit
    is set in the quorum_features field of the NVMeoF monitor map.
   -added mon commands:
     nvme-gw set beacon-diff disable
     nvme-gw set beacon-diff enable
   -performed changes in encode/decode of the BEACON_DIFF feature
   -reverted NVMEOF_BEACON_DIFF bit

Signed-off-by: Leonid Chernin <leonidc@il.ibm.com>

Revert "mon/MonClient: add get_monmap_required_features() helper"

This reverts commit 958080913083af4805f0cc4114c5c96606b05212.
Signed-off-by: Leonid Chernin <leonidc@il.ibm.com>

Merge pull request #67339 from kginonredhat/wip-74658-fix-prometheus_sd_config-returns-hostnames-instead-of-IP

mgr/cephadm: prometheus_sd_config() returns hostnames instead of IP addresses

Reviewed-by: Redouane Kachach <rkachach@ibm.com>
Reviewed-by: John Mulligan <jmulligan@redhat.com>

qa/cephadm: derive container image from cephadm release

test_cephadm.sh hardcodes IMAGE_DEFAULT to ceph:main, which breaks
every stable branch whenever main is renamed to a new release. The
mismatch check in cephadm correctly rejects the container because its
release name doesn't match cephadm's own release. This has recurred on
every release transition (squid→tentacle, quincy→reef) without a fix.

Instead of always pulling ceph:main, derive IMAGE_DEFAULT from the
installed cephadm's version output. On stable builds (release type
"stable"), use ceph:<release> so the container matches cephadm. On dev
builds (main branch), fall back to ceph:main as before. The IMAGE_DEFAULT
env var can still be set externally to override.

Fixes: https://tracker.ceph.com/issues/75821
Signed-off-by: Lumir Sliva <61183145+lumir-sliva@users.noreply.github.com>

Merge pull request #68220 from ujjawal-ibm/ceph-volume-lvm-osd-deployment

ceph-volume: skip mkfs discard for LVM NVMe OSDs

qa: fixing target release for MDS upgrade to be umbrella

Fixes: https://tracker.ceph.com/issues/75944
Signed-off-by: Redouane Kachach <rkachach@ibm.com>

cephadm: stop start cluster

Automates the procedure to shutdown and bring up an entire Ceph cluster
with one single command.

- cephadm cluster-{shutdown,start,status}

Fixes: https://tracker.ceph.com/issues/74581
Resolves: ISCE-2109

Signed-off-by: Teoman ONAY <tonay@ibm.com>

Merge pull request #67069 from ifed01/wip-ifed-fix-kvstore-tool

tools/ceph-kvstore-tool: fix crash on db close.

Reviewed-by: Adam Kupczyk <akupczyk@ibm.com>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>

Merge pull request #67669 from ujjawal-ibm/incorrect-count-multi-path-devices

cephadm: avoid double counting NVMe devices in host facts

Reviewed-by: Redouane Kachach <rkachach@ibm.com>

Merge pull request #66438 from aclamk/aclamk-bs-bluefs-wal-misalign-fix

bluestore: Fix BlueFS WAL envelope mode rendering write buffer misalignment.

Reviewed-by: Igor Fedotov <igor.fedotov@croit.io>

Merge pull request #66577 from Jayaprakash-ibm/wip-slow-ops-warn-in-scrub

os/bluestore: separate slow scrub ops from normal slow ops

Reviewed-by: Adam Kupczyk <akupczyk@ibm.com>
Reviewed-by: Igor Fedotov <igor.fedotov@croit.io>

Merge pull request #67699 from aclamk/aclamk-bs-fix-ncb-assert

os/bluestore: Solve NCB recovery asserting when onode key is missing

Reviewed-by: Igor Fedotov <igor.fedotov@croit.io>

qa: fixing nvmeof orch smoke test

Adapting the orch apply cmd to use the new pool/group arguments

Signed-off-by: Redouane Kachach <rkachach@ibm.com>
Fixes: https://tracker.ceph.com/issues/75934

Merge pull request #66992 from rkachach/fix_certmgr_error_warning

mgr/cephadm: add logic to handle certmgr errors and warnings

Reviewed-by: Guillaume Abrioux <gabrioux@ibm.com>
Reviewed-by: Shweta Bhosale <Shweta.Bhosale1@ibm.com>
Reviewed-by: Abhishek Desai <abhishek.desai1@ibm.com>

Merge pull request #67621 from tchaikov/wip-cephadm-ceph.conf

cephadm: fix rm-cluster when /etc/ceph/ceph.conf is a directory

Reviewed-by: Redouane Kachach <rkachach@redhat.com>

Merge pull request #67953 from rkachach/fix_issue_raw_osd_teuthology

qa: wipe disks in case of raw option is provided

Reviewed-by: Guillaume Abrioux <gabrioux@ibm.com>

Merge pull request #68266 from VallariAg/fix-nvmeof-upgrade-v20

qa: fix nvmeof upgrade from v20.2.0

Merge pull request #68270 from ronen-fr/wip-rf-fix-zns

crimson/os/seastore: fix WITH_ZNS builds

Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #68271 from zdover23/wip-doc-2026-04-09-cephfs-scrub

doc/cephfs: Remove spaces from command

doc/cephfs: Remove spaces from command

Remove spaces from a command. The spaces prevented the command from
functioning as intended.

Signed-off-by: Zac Dover <zac.dover@clyso.com>

crimson/os/seastore: fix WITH_ZNS builds

Build was broken for ZNS support.

Signed-off-by: Ronen Friedman <rfriedma@redhat.com>

qa/tasks/pykmip: archive pykmip log after server down

Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@clyso.com>

qa/tasks/pykmip: use OpenSSL names instead IANA

For OpenSSL 3.x which the IANA names might not be supported.

Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@clyso.com>

qa/tasks/pykmip: drop py2 deps

We don't need no more python2 dependencies

Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@clyso.com>

Revert "qa/rgw/crypt: disable failing kmip testing"

This reverts commit 5df7b44727ebe1ae070b6af7a81bb5bf07681863.

Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@clyso.com>

Merge pull request #68255 from tchaikov/wip-debian-cleanups

debian: remove stale distutils override from py3dist-overrides

Reviewed-by: Casey Bodley <cbodley@redhat.com>

Merge pull request #66385 from avanthakkar/fix-name-length-regex

mgr/smb: relax name length validation to support KMIP/GKLM aliases

Reviewed-by: Xavi Hernandez <xhernandez@gmail.com>
Reviewed-by: Anoop C S <anoopcs@cryptolab.net>
Reviewed-by: John Mulligan <jmulligan@redhat.com>

mgr/dashboard: use border-subtle utility class in overview and tearsheet

Replace the remaining custom dashboard border classes in the overview alerts card and tearsheet with the shared border-subtle utility classes. Update the alerts-card unit test so it checks the shared utility class name used by the template. Stub Prometheus overview requests in the dashboard a11y Cypress test so the test does not fail on missing metrics in CI.

Fixes: http://tracker.ceph.com/issues/75404
Signed-off-by: Annmool <aydv.267@gmail.com>

Merge pull request #68225 from Matan-B/wip-matanb-split-timeouts

qa/suites/crimson-rados/../pggrow: increase op_delay

qa: fix nvmeof upgrade from v20.2.0

Bootstrap fails on v20.2.0 upgrade because of
cephadm binary and ceph image version mismatch.

This fixes following problem in bootstrap by using
tentacle cephadm binary:
```
Error: Container release tentacle != cephadm release umbrella; please use matching version of cephadm (pass --allow-mismatched-release to continue anyway)
```

Fixes: https://tracker.ceph.com/issues/75912
Signed-off-by: Vallari Agrawal <vallari.agrawal@ibm.com>

mgr/smb: relax name length validation to support KMIP/GKLM aliases

Introduce new regex for mem/kmip key names to allow up to 63 characters, which
matches the maximum permitted DNS label length (RFC 1035).

Signed-off-by: Avan Thakkar <athakkar@redhat.com>

Merge PR #68125 into main

* refs/pull/68125/head:
libcephsqlite: ensure atexit handlers are registered after openssl

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>

Merge pull request #68235 from bluikko/wip-src-osd-fix-commpact-typo

src/osd: fix typo in asok command help in OSD.cc

Reviewed-by: Kefu Chai <k.chai@proxmox.com>

debian: remove stale distutils override from py3dist-overrides

distutils was deprecated in Python 3.10 (PEP 632) and removed in
Python 3.12. The `python3-distutils` package no longer exists in
Debian Trixie (Python 3.13) or Ubuntu 24.04+ (Python 3.12).

The only runtime reference was in `debian/ceph-mgr.requires`, already
cleaned up by 3fb3f892aa3. This override is now dead code, hence no
installed file declares a runtime dependency on `distutils`, so
`dh_python3` never resolves it. Removing it prevents a latent
uninstallable-dependency bug if `distutils` were accidentally
reintroduced in a `.requires` file.

Fixes: https://tracker.ceph.com/issues/75901
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
Signed-off-by: Max R. Carrara <m.carrara@proxmox.com>
Signed-off-by: Kefu Chai <k.chai@proxmox.com>

Merge pull request #68234 from bluikko/wip-doc-rados-mons-fix-reconfig-command

doc/rados: fix command syntax in add-or-rm-mons.rst

Merge pull request #68237 from bluikko/wip-doc-rados-ops-lrc-prompts

doc/rados: improve operations/erasure-code-lrc.rst

mgr/dashboard: Fixing IOPs chart values as whole numbers
Fixes: https://tracker.ceph.com/issues/75872
Signed-off-by: Devika Babrekar <devika.babrekar@ibm.com>

libcephsqlite: ensure atexit handlers are registered after openssl

When the sqlite3 executable encounters an error with .bail=on, it will
make a call to exit(). The atexit() handlers will execute in LIFO order.
We need to ensure that openssl (before OpenSSL 4.0 [1]) atexit handlers are
registered before libcephsqlite.

[1] http://github.com/openssl/openssl/commit/31659fe32673a6bd66abf3f8a7d803e81c6ffeed (OpenSSL 4.0 no longer arms `OPENSSL_cleanup()` function as an `atexit(3)`)

Fixes: https://tracker.ceph.com/issues/59335
Signed-off-by: Patrick Donnelly <pdonnell@ibm.com>

Merge pull request #67945 from ion-drorg/wip_75403_pg_op_ordering

osd: fix PrimaryLogPG op ordering during laggy state

Reviewed-by: Bill Scales <bill_scales@uk.ibm.com>

Merge pull request #67113 from ivancich/wip-update-bucket-shard-docs

doc/rgw: describe more details of bucket index shards and resharding

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>

Merge pull request #68218 from NitzanMordhai/wip-nitzan-valgrind-reachable-dlopen-leak

qa: suppress reachable dlopen leak in libceph-common

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>

Merge pull request #67678 from cbodley/wip-qa-rgw-verify-java-last-revert

Revert "qa/rgw: the rgw/verify suite runs java tests last"

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>

Merge pull request #67733 from NitzanMordhai/wip-nitzan-rocky10-valgrind-rocksdb-leak-stillreachable

qa: Leak_StillReachable RocksDB error_handler

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

doc/rgw: describe more details of bucket index shards and resharding

Additional information added to the development documentation.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>

Merge pull request #68233 from ivancich/wip-fix-s3tests-java-home-2

rgw: enhanced java s3-tests change setting of JAVA_HOME

Reviewed-by: Casey Bodley <cbodley@redhat.com>

common/perf_counters: improve add() performance

The new version is faster by 13-17% (depending
on the number of counters) compared to the
previous version.

Signed-off-by: Ronen Friedman <rfriedma@redhat.com>

Merge pull request #68198 from rhcs-dashboard/fix/observability-alert-rules-breadcrumb

mgr/dashboard: Rename Alert breadcrumb to Alert Rules

Reviewed-by: Afreen Misbah <afreen@ibm.com>

qa/suites/crimson-rados/../pggrow: increase op_delay

Increase op_delay to pggrow to avoid rapid PG splits.
Excessive splitting with a low reactor count can leave many PGs in
snaptrim, causing tests to hit the (short) snap trimming timeout.

Crimson's pggrow keeps the OSDs clean thorugout the entire test,
which is against do_thrash expectations.
Increasing op_delay would reduce do_thrash "actions" back to a normal rate.

Fixes: https://tracker.ceph.com/issues/75273
Signed-off-by: Matan Breizman <mbreizma@redhat.com>

mgr/dashboard:Adding MSR EC Profile via dashboard
Fixes: https://tracker.ceph.com/issues/75547
Signed-off-by: Devika Babrekar <devika.babrekar@ibm.com>

doc/rados: improve operations/erasure-code-lrc.rst

Use prompts that cannot be selected in CLI examples. Remove warnings
about selectable prompts.
Use privileged prompt for ceph commands.
Use inline formatting consistently.
Improve capitalization.

Signed-off-by: Ville Ojamo <git2233+ceph@ojamo.eu>

Merge pull request #68111 from Naveenaidu/wip-naveen-strip-vendor-release-newline

common/version: strip trailing newline from vendor release file

Reviewed-by: Bill Scales <bill_scales@uk.ibm.com>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>

src/osd: fix typo in asok command help in OSD.cc

Fix "Commpact" into "Compact".

Signed-off-by: Ville Ojamo <git2233+ceph@ojamo.eu>

rgw/test: enhanced java s3-tests change setting of JAVA_HOME

Under Centos 9 the Java 8 version is recognized by the substring
"java-1.8" rather than "java-8". So the grep has been modified to
accept either.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
(cherry picked from commit a49d4446e4d84b28273b460b85a193011a9c4ed8)

Merge PR #68025 into main

* refs/pull/68025/head:
mailmap: Add Karthik U S

Reviewed-by: Patrick Donnelly <pdonnell@ibm.com>

Merge pull request #68029 from djgalloway/rook-e2e

ci: Fixes for ceph-rook-e2e job

Merge pull request #68208 from ivancich/wip-fix-s3tests-java-home

rgw: java s3-tests change setting of JAVA_HOME

Reviewed-by: Casey Bodley <cbodley@redhat.com>

Merge PR #68004 into main

* refs/pull/68004/head:
doc: add notable changes for v20.2.1
doc: add 20.2.1 Release Notes

Reviewed-by: Patrick Donnelly <pdonnell@ibm.com>
Reviewed-by: Redouane Kachach <rkachach@redhat.com>
Reviewed-by: Adam C. Emerson <aemerson@redhat.com>