From: Sage Weil Date: Thu, 11 Jul 2019 21:28:34 +0000 (-0500) Subject: Merge PR #28944 into master X-Git-Tag: v15.1.0~2232 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ec62f786304f8aa223563a0f8aed722262abd434;p=ceph.git Merge PR #28944 into master * refs/pull/28944/head: qa/workunits/rados/test_cache_pool.sh: s/forward/proxy/ qa/workunits/cephtool/test.sh: cache forward mode is no longer allowed mon/OSDMonitor: forward -> proxy, readforward -> readproxy on octopus mon/OSDMonitor: disallow FORWARD and READFORWARD cache modes osd: do proxy when in forward/readforward cache modes Reviewed-by: Neha Ojha --- ec62f786304f8aa223563a0f8aed722262abd434