Merge branch 'wip_pg_res'

Reviewed-by: Sage Weil <sage@inktank.com>

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

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

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

diff --cc src/tools/ceph-filestore-dump.cc
Simple merge