]> 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: 9025b90 a744796)
qa/suites/orch/cephadm: resolve merge conflicts 58418/head
authorLaura Flores <lflores@ibm.com>
Thu, 11 Jul 2024 23:17:26 +0000 (18:17 -0500)
committerLaura Flores <lflores@ibm.com>
Thu, 11 Jul 2024 23:17:26 +0000 (18:17 -0500)
There were some ignorelist warnings that were merged to squid
after the cherry-pick for squid-release was created.

Signed-off-by: Laura Flores <lflores@ibm.com>
1  2 
CMakeLists.txt patch | diff1 | diff2 | blob | history

diff --cc CMakeLists.txt
Simple merge
Unnamed repository; edit this file 'description' to name the repository.