]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #1614 from ceph/wip-7964
authorSage Weil <sage@inktank.com>
Mon, 7 Apr 2014 21:01:58 +0000 (14:01 -0700)
committerSage Weil <sage@inktank.com>
Mon, 7 Apr 2014 21:01:58 +0000 (14:01 -0700)
Wip 7964

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

Simple merge