Merge pull request #32951 from matthewoliver/cephadm_rgw_ssl

author Sebastian Wagner <sebastian.wagner@suse.com>

Fri, 17 Apr 2020 16:54:50 +0000 (18:54 +0200)

committer GitHub <noreply@github.com>

Fri, 17 Apr 2020 16:54:50 +0000 (18:54 +0200)
author Sebastian Wagner <sebastian.wagner@suse.com>
Fri, 17 Apr 2020 16:54:50 +0000 (18:54 +0200)
committer GitHub <noreply@github.com>
Fri, 17 Apr 2020 16:54:50 +0000 (18:54 +0200)
diff --cc src/pybind/mgr/cephadm/module.py
Simple merge
diff --cc src/pybind/mgr/orchestrator/module.py
Simple merge
author	Sebastian Wagner <sebastian.wagner@suse.com>
	Fri, 17 Apr 2020 16:54:50 +0000 (18:54 +0200)
committer	GitHub <noreply@github.com>
	Fri, 17 Apr 2020 16:54:50 +0000 (18:54 +0200)
		1	2
src/pybind/mgr/cephadm/module.py	patch \|	diff1 \|	diff2 \|	blob \| history
src/pybind/mgr/orchestrator/module.py	patch \|	diff1 \|	diff2 \|	blob \| history