]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9a04e75 9b26de3)
Merge pull request #3155 from athanatos/wip-8011
authorSage Weil <sage@redhat.com>
Thu, 11 Dec 2014 21:42:09 +0000 (13:42 -0800)
committerSage Weil <sage@redhat.com>
Thu, 11 Dec 2014 21:42:09 +0000 (13:42 -0800)
ReplicatedPG: fail a non-blocking flush if the object is being scrubbed

Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
src/osd/ReplicatedPG.cc patch | diff1 | diff2 | blob | history

diff --cc src/osd/ReplicatedPG.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.