]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #1459 from ceph/wip-7696
authorSage Weil <sage@inktank.com>
Fri, 14 Mar 2014 18:28:50 +0000 (11:28 -0700)
committerSage Weil <sage@inktank.com>
Fri, 14 Mar 2014 18:28:50 +0000 (11:28 -0700)
Wip 7696

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

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