Merge pull request #580 from ceph/wip-6033-redirects

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

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

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

diff --cc src/osd/osd_types.h
Simple merge

diff --cc src/test/encoding/types.h
Simple merge