]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #1405 from ceph/wip-7575
authorSage Weil <sage@inktank.com>
Sun, 9 Mar 2014 19:21:35 +0000 (12:21 -0700)
committerSage Weil <sage@inktank.com>
Sun, 9 Mar 2014 19:21:35 +0000 (12:21 -0700)
osd: Add hit_set_flushing to track current flushes and prevent races

Reviewed-by: Sage Weil <sage@inktank.com>
Reviewed-by: Samuel Just <sam.just@inktank.com>
1  2 
src/osd/ReplicatedPG.cc
src/osd/ReplicatedPG.h

Simple merge
Simple merge