Merge remote-tracking branch 'gh/octopus'

author Sage Weil <sage@redhat.com>

Tue, 24 Mar 2020 01:09:41 +0000 (20:09 -0500)

committer Sage Weil <sage@redhat.com>

Tue, 24 Mar 2020 01:09:41 +0000 (20:09 -0500)
author Sage Weil <sage@redhat.com>
Tue, 24 Mar 2020 01:09:41 +0000 (20:09 -0500)
committer Sage Weil <sage@redhat.com>
Tue, 24 Mar 2020 01:09:41 +0000 (20:09 -0500)
diff --cc CMakeLists.txt
Simple merge
diff --cc src/cephadm/cephadm
Simple merge
diff --cc src/common/options.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Tue, 24 Mar 2020 01:09:41 +0000 (20:09 -0500)
committer	Sage Weil <sage@redhat.com>
	Tue, 24 Mar 2020 01:09:41 +0000 (20:09 -0500)
		1	2
CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
src/cephadm/cephadm	patch \|	diff1 \|	diff2 \|	blob \| history
src/common/options.cc	patch \|	diff1 \|	diff2 \|	blob \| history