]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge pull request #1440 from ceph/wip-7649
authorSamuel Just <sam.just@inktank.com>
Thu, 13 Mar 2014 01:33:03 +0000 (18:33 -0700)
committerSamuel Just <sam.just@inktank.com>
Thu, 13 Mar 2014 01:33:03 +0000 (18:33 -0700)
commitfce63aa821c66e0ab2b4e2d104ae6ec6dc2c1e54
tree25c84787d0c742a495500c8cb3688c7b917515cb
parentb5d2df4a9247cbf7831dd82369fa4e04b3db1b9c
parenta4a91ccdc503abe1a5e91723e03126c189e5a4b5
Merge pull request #1440 from ceph/wip-7649

Wip 7649

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