]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #6014 from athanatos/wip-13108
authorSage Weil <sage@redhat.com>
Mon, 21 Sep 2015 18:51:50 +0000 (14:51 -0400)
committerSage Weil <sage@redhat.com>
Mon, 21 Sep 2015 18:51:50 +0000 (14:51 -0400)
Revert "osd: purge the object from the cache when proxying and not pr…

Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
src/osd/ReplicatedPG.cc

Simple merge