]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bb264dd 09b7edd)
Merge PR #28944 into master
authorSage Weil <sage@redhat.com>
Thu, 11 Jul 2019 21:28:34 +0000 (16:28 -0500)
committerSage Weil <sage@redhat.com>
Thu, 11 Jul 2019 21:28:34 +0000 (16:28 -0500)
* 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 <nojha@redhat.com>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.