]> 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: 6091aa6 8da38f3)
Merge pull request #54173 from phlogistonjohn/jjm-cephadm-jinja-2
authorAdam King <47704447+adk3798@users.noreply.github.com>
Fri, 17 Nov 2023 00:40:16 +0000 (19:40 -0500)
committerGitHub <noreply@github.com>
Fri, 17 Nov 2023 00:40:16 +0000 (19:40 -0500)
cephadm: expand support for dependencies bundled into the zipapp

Reviewed-by: Adam King <adking@redhat.com>
1  2 
src/cephadm/build.py patch | diff1 | diff2 | blob | history
src/cephadm/cephadm.py patch | diff1 | diff2 | blob | history

diff --cc src/cephadm/build.py
Simple merge
diff --cc src/cephadm/cephadm.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.