Merge branch 'master' into anthonyeleven/docs-14730

author Anthony D'Atri <anthonyeleven@users.noreply.github.com>

Mon, 23 Nov 2020 17:31:29 +0000 (09:31 -0800)

committer GitHub <noreply@github.com>

Mon, 23 Nov 2020 17:31:29 +0000 (09:31 -0800)
author Anthony D'Atri <anthonyeleven@users.noreply.github.com>
Mon, 23 Nov 2020 17:31:29 +0000 (09:31 -0800)
committer GitHub <noreply@github.com>
Mon, 23 Nov 2020 17:31:29 +0000 (09:31 -0800)
diff --cc doc/rados/troubleshooting/troubleshooting-osd.rst
Simple merge
author	Anthony D'Atri <anthonyeleven@users.noreply.github.com>
	Mon, 23 Nov 2020 17:31:29 +0000 (09:31 -0800)
committer	GitHub <noreply@github.com>
	Mon, 23 Nov 2020 17:31:29 +0000 (09:31 -0800)