]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #3975 from wonzhq/skip-cache
authorSage Weil <sage@redhat.com>
Fri, 1 May 2015 16:16:05 +0000 (09:16 -0700)
committerSage Weil <sage@redhat.com>
Fri, 1 May 2015 16:16:05 +0000 (09:16 -0700)
osd: flush/evict op fixes

Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
src/osd/OSD.cc
src/osd/OpRequest.cc
src/osd/OpRequest.h
src/osd/ReplicatedPG.cc
src/osd/ReplicatedPG.h
src/test/librados/tier.cc

diff --cc src/osd/OSD.cc
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge