Merge pull request #2456 from ceph/wip-9031-9262

Wip 9031 9262

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Loic Dachary <loic-201408@dachary.org>

diff --cc src/librados/librados.cc
Simple merge

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/osdc/Objecter.cc
Simple merge

diff --cc src/osdc/Objecter.h
Simple merge

diff --cc src/rgw/rgw_rados.cc
Simple merge

diff --cc src/rgw/rgw_rados.h
Simple merge

diff --cc src/test/Makefile.am
Simple merge