Merge pull request #39802 from p-se/wip-pse-cephadm-SUSE-alertmanager-octopus

author Kefu Chai <kchai@redhat.com>

Tue, 27 Apr 2021 06:12:55 +0000 (14:12 +0800)

committer GitHub <noreply@github.com>

Tue, 27 Apr 2021 06:12:55 +0000 (14:12 +0800)
author Kefu Chai <kchai@redhat.com>
Tue, 27 Apr 2021 06:12:55 +0000 (14:12 +0800)
committer GitHub <noreply@github.com>
Tue, 27 Apr 2021 06:12:55 +0000 (14:12 +0800)
diff --cc src/cephadm/cephadm
Simple merge
diff --cc src/cephadm/tests/test_cephadm.py
Simple merge
author	Kefu Chai <kchai@redhat.com>
	Tue, 27 Apr 2021 06:12:55 +0000 (14:12 +0800)
committer	GitHub <noreply@github.com>
	Tue, 27 Apr 2021 06:12:55 +0000 (14:12 +0800)
		1	2
src/cephadm/cephadm	patch \|	diff1 \|	diff2 \|	blob \| history
src/cephadm/tests/test_cephadm.py	patch \|	diff1 \|	diff2 \|	blob \| history