]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'upstream/wip_2476' into next
authorSamuel Just <sam.just@inktank.com>
Wed, 24 Apr 2013 21:03:38 +0000 (14:03 -0700)
committerSamuel Just <sam.just@inktank.com>
Wed, 24 Apr 2013 21:04:07 +0000 (14:04 -0700)
Fixes: #2476
Reviewed-by: Greg Farnum <greg@inktank.com>
1  2 
src/osd/PG.cc

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