]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
projects / ceph-ci.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8f1c89d 01126e8)
Merge pull request #57971 from adk3798/squid-adjust-bootstrap-config-priorities
authorAdam King <47704447+adk3798@users.noreply.github.com>
Wed, 10 Jul 2024 15:23:29 +0000 (11:23 -0400)
committerGitHub <noreply@github.com>
Wed, 10 Jul 2024 15:23:29 +0000 (11:23 -0400)
squid: cephadm: the user config is preferred during the bootstrap

Reviewed-by: John Mulligan <jmulligan@redhat.com>
1  2 
src/cephadm/cephadm.py patch | diff1 | diff2 | blob | history

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