Merge pull request #45409 from NUABO/tancz

author Yuri Weinstein <yweinste@redhat.com>

Tue, 24 May 2022 14:59:36 +0000 (07:59 -0700)

committer GitHub <noreply@github.com>

Tue, 24 May 2022 14:59:36 +0000 (07:59 -0700)
author Yuri Weinstein <yweinste@redhat.com>
Tue, 24 May 2022 14:59:36 +0000 (07:59 -0700)
committer GitHub <noreply@github.com>
Tue, 24 May 2022 14:59:36 +0000 (07:59 -0700)
diff --cc doc/man/8/ceph.rst
Simple merge
diff --cc qa/workunits/cephtool/test.sh
Simple merge
diff --cc src/mon/MonCommands.h
Simple merge
diff --cc src/mon/OSDMonitor.cc
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Tue, 24 May 2022 14:59:36 +0000 (07:59 -0700)
committer	GitHub <noreply@github.com>
	Tue, 24 May 2022 14:59:36 +0000 (07:59 -0700)
		1	2
doc/man/8/ceph.rst	patch \|	diff1 \|	diff2 \|	blob \| history
qa/workunits/cephtool/test.sh	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/MonCommands.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history