]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 003c659 90301b7)
Merge branch 'wip-65890-squid' of https://github.com/pdvian/ceph into wip-yuri11...
authorYuri Weinstein <yweinste@redhat.com>
Mon, 1 Jul 2024 22:41:57 +0000 (15:41 -0700)
committerYuri Weinstein <yweinste@redhat.com>
Mon, 1 Jul 2024 22:41:57 +0000 (15:41 -0700)
1  2 
ceph.spec.in patch | diff1 | diff2 | blob | history
src/common/options/global.yaml.in patch | diff1 | diff2 | blob | history

diff --cc ceph.spec.in
Simple merge
diff --cc src/common/options/global.yaml.in
Simple merge
Unnamed repository; edit this file 'description' to name the repository.