From: Jason Dillaman <dillaman@redhat.com>
Date: Fri, 17 Feb 2017 13:03:24 +0000 (-0500)
Subject: Merge pull request #13437 from Liuchang0812/cleanup-rbd
X-Git-Tag: v12.0.1~363
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=50f7857ce8397904934f37bc229eca6e713ed668;p=ceph.git

Merge pull request #13437 from Liuchang0812/cleanup-rbd

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

50f7857ce8397904934f37bc229eca6e713ed668
diff --cc src/test/rbd_mirror/test_mock_ImageReplayer.cc
index 4db6ee4f3ee6,5b717c5b5fe3..697f04194921
--- a/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();