]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #68923 into main
authorPatrick Donnelly <pdonnell@ibm.com>
Fri, 15 May 2026 15:15:46 +0000 (11:15 -0400)
committerPatrick Donnelly <pdonnell@ibm.com>
Fri, 15 May 2026 15:15:46 +0000 (11:15 -0400)
* refs/pull/68923/head:
script/ptl-tool: consolidate conflict reviews

Reviewed-by: Yuri Weinstein <yweins@redhat.com>

Trivial merge