]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge pull request #3363 from liewegas/wip-cache-fix
authorSamuel Just <sam.just@inktank.com>
Thu, 22 Jan 2015 19:10:37 +0000 (11:10 -0800)
committerSamuel Just <sam.just@inktank.com>
Thu, 22 Jan 2015 19:10:37 +0000 (11:10 -0800)
commita4a9ec9d4d54e4c353aa429c049696d1f8953dfc
tree01beb886ca1596c6b45a1e5a0ba7d2be4938c95a
parent266cf2e5fa93f4d4921049fa20a7d8bd94a4721b
parent8d706cd0380f5967e750da7170f4758f83c162ca
Merge pull request #3363 from liewegas/wip-cache-fix

osd: fix ReplicatedPG::cancel_proxy_read_ops()

Reviewed-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
src/osd/ReplicatedPG.cc
src/osd/ReplicatedPG.h