Merge branch 'wip-11286' of https://github.com/dillaman/ceph

Reviewed-by: Josh Durgin <jdurgin@redhat.com>

diff --cc ceph.spec.in
Simple merge

diff --cc src/Makefile.am
Simple merge

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

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

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