]> 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: 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)
commitdc779d5f8821ff2ec10b0a0c9caaea68fb1297e4
tree4d10a943765ed6b955e906a80bc22f6084e823dctree | snapshot
parent32cb979e34e2b8a447c9f5954707e63b54305af7commit | diff
parenteef55dbb754387711ef846285d2877435e7d1819commit | diff
Merge PR #70165 into main

* refs/pull/70165/head:
script/ptl-tool: handle cherry-pick conflicts on branch-specific commits

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