]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commitf8ebbbbbdd5d598387b611be475dfb19bca6f6e3
tree80bd15c1e6c203f4b6e17a09ada542a007906682tree | snapshot
parent1069fc8a75aa7bfa80424783057724751d5b2f18commit | diff
parent475cdecaf4f4ce4fa0bf0352aad7338c46590300commit | diff
Merge PR #68987 into main

* refs/pull/68987/head:
script/ptl-tool: use provided base even in conflict

Reviewed-by: Yuri Weinstein <yweins@redhat.com>
Unnamed repository; edit this file 'description' to name the repository.