]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f9acd3a f856739)
Merge pull request #3943 from dachary/wip-8011-firefly
authorLoic Dachary <ldachary@redhat.com>
Mon, 16 Mar 2015 15:39:41 +0000 (16:39 +0100)
committerLoic Dachary <ldachary@redhat.com>
Mon, 16 Mar 2015 15:39:41 +0000 (16:39 +0100)
ReplicatedPG: fail a non-blocking flush if the object is being scrubbed

Reviewed-by: Samuel Just <sjust@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.