]> 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: 32cb979 eef55db)
Merge PR #70165 into main
authorPatrick Donnelly <pdonnell@ibm.com>
Tue, 14 Jul 2026 00:11:13 +0000 (20:11 -0400)
committerPatrick Donnelly <pdonnell@ibm.com>
Tue, 14 Jul 2026 00:11:13 +0000 (20:11 -0400)
* refs/pull/70165/head:
script/ptl-tool: handle cherry-pick conflicts on branch-specific commits

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

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