Merge pull request #39578 from neha-ojha/wip-49320-octopus

author Yuri Weinstein <yweinste@redhat.com>

Thu, 18 Mar 2021 16:23:59 +0000 (09:23 -0700)

committer GitHub <noreply@github.com>

Thu, 18 Mar 2021 16:23:59 +0000 (09:23 -0700)
author Yuri Weinstein <yweinste@redhat.com>
Thu, 18 Mar 2021 16:23:59 +0000 (09:23 -0700)
committer GitHub <noreply@github.com>
Thu, 18 Mar 2021 16:23:59 +0000 (09:23 -0700)
diff --cc qa/suites/rados/singleton/all/thrash_cache_writeback_proxy_none.yaml
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Thu, 18 Mar 2021 16:23:59 +0000 (09:23 -0700)
committer	GitHub <noreply@github.com>
	Thu, 18 Mar 2021 16:23:59 +0000 (09:23 -0700)