Merge pull request #58482 from guits/wip-66028-squid

author Guillaume Abrioux <gabrioux@ibm.com>

Fri, 2 Aug 2024 10:59:03 +0000 (12:59 +0200)

committer GitHub <noreply@github.com>

Fri, 2 Aug 2024 10:59:03 +0000 (12:59 +0200)
author Guillaume Abrioux <gabrioux@ibm.com>
Fri, 2 Aug 2024 10:59:03 +0000 (12:59 +0200)
committer GitHub <noreply@github.com>
Fri, 2 Aug 2024 10:59:03 +0000 (12:59 +0200)
diff --cc src/pybind/mgr/cephadm/agent.py
Simple merge
diff --cc src/pybind/mgr/cephadm/inventory.py
Simple merge
diff --cc src/pybind/mgr/orchestrator/module.py
Simple merge
author	Guillaume Abrioux <gabrioux@ibm.com>
	Fri, 2 Aug 2024 10:59:03 +0000 (12:59 +0200)
committer	GitHub <noreply@github.com>
	Fri, 2 Aug 2024 10:59:03 +0000 (12:59 +0200)
		1	2
src/pybind/mgr/cephadm/agent.py	patch \|	diff1 \|	diff2 \|	blob \| history
src/pybind/mgr/cephadm/inventory.py	patch \|	diff1 \|	diff2 \|	blob \| history
src/pybind/mgr/orchestrator/module.py	patch \|	diff1 \|	diff2 \|	blob \| history