]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1069fc8 475cdec)
Merge PR #68987 into main
authorPatrick Donnelly <pdonnell@ibm.com>
Wed, 20 May 2026 00:30:23 +0000 (20:30 -0400)
committerPatrick Donnelly <pdonnell@ibm.com>
Wed, 20 May 2026 00:30:23 +0000 (20:30 -0400)
* refs/pull/68987/head:
script/ptl-tool: use provided base even in conflict

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

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.