Merge pull request #13437 from Liuchang0812/cleanup-rbd

librbd: use 'override' keyword instead of 'virtual'

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

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

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

diff --cc src/test/rbd_mirror/test_mock_ImageReplayer.cc
index 4db6ee4f3ee67c5d1d9d244fd4f3c791b575adc3,5b717c5b5fe3ec5a25625bfd5d08b62bfe63f060..697f041949211cd4a9d3c8e4b47bab82ee59bca2
--- 1/src/test/rbd_mirror/test_mock_ImageReplayer.cc
--- 2/src/test/rbd_mirror/test_mock_ImageReplayer.cc
+++ b/src/test/rbd_mirror/test_mock_ImageReplayer.cc
@@@ -265,12 -265,12 +265,12 @@@ public
      m_image_replayer = new MockImageReplayer(
        m_threads, m_image_deleter, m_image_sync_throttler,
        rbd::mirror::RadosRef(new librados::Rados(m_local_io_ctx)),
 -      rbd::mirror::RadosRef(new librados::Rados(m_remote_io_ctx)),
 -      "local_mirror_uuid", "remote_mirror_uuid", m_local_io_ctx.get_id(),
 -      m_remote_io_ctx.get_id(), m_remote_image_ctx->id, "global image id");
 +      "local_mirror_uuid", m_local_io_ctx.get_id(), "global image id");
 +    m_image_replayer->add_remote_image(
 +      "remote_mirror_uuid", m_remote_image_ctx->id, m_remote_io_ctx);
    }
  
-   virtual void TearDown() {
+   void TearDown() override {
      delete m_image_replayer;
  
      TestMockFixture::TearDown();

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

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

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

diff --cc src/tools/rbd_nbd/rbd-nbd.cc
Simple merge