Merge pull request #43763 from rhcs-dashboard/cephadm_box

author Alfonso Martínez <almartin@redhat.com>

Tue, 4 Jan 2022 16:22:56 +0000 (17:22 +0100)

committer GitHub <noreply@github.com>

Tue, 4 Jan 2022 16:22:56 +0000 (17:22 +0100)
author Alfonso Martínez <almartin@redhat.com>
Tue, 4 Jan 2022 16:22:56 +0000 (17:22 +0100)
committer GitHub <noreply@github.com>
Tue, 4 Jan 2022 16:22:56 +0000 (17:22 +0100)
diff --cc ceph.spec.in
Simple merge
diff --cc src/cephadm/cephadm
Simple merge
author	Alfonso Martínez <almartin@redhat.com>
	Tue, 4 Jan 2022 16:22:56 +0000 (17:22 +0100)
committer	GitHub <noreply@github.com>
	Tue, 4 Jan 2022 16:22:56 +0000 (17:22 +0100)
		1	2
ceph.spec.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/cephadm/cephadm	patch \|	diff1 \|	diff2 \|	blob \| history