Merge pull request #37201 from tchaikov/octopus-doc-rtd

author Kefu Chai <kchai@redhat.com>

Thu, 17 Sep 2020 01:39:09 +0000 (09:39 +0800)

committer GitHub <noreply@github.com>

Thu, 17 Sep 2020 01:39:09 +0000 (09:39 +0800)
author Kefu Chai <kchai@redhat.com>
Thu, 17 Sep 2020 01:39:09 +0000 (09:39 +0800)
committer GitHub <noreply@github.com>
Thu, 17 Sep 2020 01:39:09 +0000 (09:39 +0800)
diff --cc doc/radosgw/index.rst
Simple merge
diff --cc doc/rbd/rbd-persistent-cache.rst
Simple merge
author	Kefu Chai <kchai@redhat.com>
	Thu, 17 Sep 2020 01:39:09 +0000 (09:39 +0800)
committer	GitHub <noreply@github.com>
	Thu, 17 Sep 2020 01:39:09 +0000 (09:39 +0800)
		1	2
doc/radosgw/index.rst	patch \|	diff1 \|	diff2 \|	blob \| history
doc/rbd/rbd-persistent-cache.rst	patch \|	diff1 \|	diff2 \|	blob \| history