Merge branch 'mgr_mon_osdc__references' of https://github.com/MaxKellermann/ceph...

diff --cc src/include/neorados/RADOS.hpp
Simple merge

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

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

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

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

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

diff --cc src/librbd/Utils.cc
Simple merge

diff --cc src/librbd/api/Mirror.cc
Simple merge

diff --cc src/librbd/api/PoolMetadata.cc
Simple merge

diff --cc src/librbd/api/Trash.cc
Simple merge

diff --cc src/mds/MDSRank.cc
Simple merge

diff --cc src/mgr/ActivePyModules.cc
Simple merge

diff --cc src/mgr/BaseMgrModule.cc
Simple merge

diff --cc src/mgr/DaemonServer.cc
Simple merge

diff --cc src/mgr/MgrClient.cc
Simple merge

diff --cc src/mgr/MgrClient.h
Simple merge

diff --cc src/mgr/MgrContext.h
Simple merge

diff --cc src/mon/MonClient.h
Simple merge

diff --cc src/mon/Monitor.cc
Simple merge

diff --cc src/neorados/RADOS.cc
Simple merge

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

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

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

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

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

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

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

diff --cc src/rgw/driver/rados/rgw_dedup.cc
Simple merge

diff --cc src/rgw/driver/rados/rgw_tools.cc
Simple merge

diff --cc src/rgw/services/svc_config_key_rados.cc
Simple merge

diff --cc src/test/cls_hello/test_cls_hello.cc
Simple merge

diff --cc src/test/lazy-omap-stats/lazy_omap_stats_test.cc
Simple merge

diff --cc src/test/lazy-omap-stats/lazy_omap_stats_test.h
Simple merge

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

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

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

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

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

diff --cc src/test/librados_test_stub/LibradosTestStub.cc
Simple merge

diff --cc src/test/librados_test_stub/NeoradosTestStub.cc
Simple merge

diff --cc src/test/multi_stress_watch.cc
Simple merge

diff --cc src/test/osd/RadosModel.h
Simple merge

diff --cc src/test/osd/ceph_test_osd_stale_read.cc
Simple merge

diff --cc src/test/rbd_mirror/test_ClusterWatcher.cc
Simple merge

diff --cc src/tools/ceph_dedup/ceph_dedup_tool.cc
Simple merge

diff --cc src/tools/cephfs_mirror/PeerReplayer.cc
Simple merge

diff --cc src/tools/rbd/MirrorDaemonServiceInfo.cc
Simple merge

diff --cc src/tools/rbd/Utils.cc
Simple merge

diff --cc src/tools/rbd/action/Config.cc
Simple merge

diff --cc src/tools/rbd/action/Perf.cc
Simple merge

diff --cc src/tools/rbd_mirror/ClusterWatcher.cc
Simple merge